Merge branch 'ticket/paul999/9696' into develop-olympus

* ticket/paul999/9696:
  [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir.
This commit is contained in:
Andreas Fischer 2010-11-07 13:12:16 +01:00
commit 371e54e054

View file

@ -1052,7 +1052,7 @@ function phpbb_own_realpath($path)
// @todo If the file exists fine and open_basedir only has one path we should be able to prepend it
// because we must be inside that basedir, the question is where...
// @internal The slash in is_dir() gets around an open_basedir restriction
if (!@file_exists($resolved) || (!is_dir($resolved . '/') && !is_file($resolved)))
if (!@file_exists($resolved) || (!@is_dir($resolved . '/') && !is_file($resolved)))
{
return false;
}