diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-11-07 15:00:02 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-11-07 15:00:02 +0100 |
| commit | f15446fe39734ae6e6314912055d95f3d6d60e6b (patch) | |
| tree | c7cf19753c956ba7e7b5c867547bbb462cc873c1 /phpBB/includes/functions.php | |
| parent | bcdca1152d41711df37b2c0a0224f21e711c3cab (diff) | |
| parent | 6c04e7ed800542e180f9f550a7be4938d7551d68 (diff) | |
| download | forums-f15446fe39734ae6e6314912055d95f3d6d60e6b.tar forums-f15446fe39734ae6e6314912055d95f3d6d60e6b.tar.gz forums-f15446fe39734ae6e6314912055d95f3d6d60e6b.tar.bz2 forums-f15446fe39734ae6e6314912055d95f3d6d60e6b.tar.xz forums-f15446fe39734ae6e6314912055d95f3d6d60e6b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9880] Change "antibot" to "anti-spambot".
[ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir.
[ticket/9880] Changing the term 'CAPTCHA' to something more obvious.
[task/phing-build] Automatically trigger build_diff
[task/phing-build] Added a build.xml configuration for phing.
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0f150a3d63..759aee6db8 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -992,7 +992,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; } |