diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:34:18 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:34:18 +0200 |
| commit | e4ff780c1370d9f743da0fffc70b98be0c7cfe92 (patch) | |
| tree | 00738becf05268632411007a93ff06407ca1917a /phpBB/includes/functions.php | |
| parent | c4a65a469709a8ffdeb52f9d3556545993f2347a (diff) | |
| parent | dbe8fb6488005c3295f839c7302a56f1de872426 (diff) | |
| download | forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.gz forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.bz2 forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.xz forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9117] Wrong redirection after login.
[ticket/9772] Unify permissions for sending email when board_email_form is off
[ticket/7369] CPF date should always render the users selection.
[ticket/7296] Exporting styles to tar creates corrupted archives.
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4088e92b63..a7988cfa60 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -718,7 +718,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ) clearstatcache(); - if (is_readable($filename) && is_writable($filename)) + if (is_readable($filename) && phpbb_is_writable($filename)) { break; } @@ -728,7 +728,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ) clearstatcache(); - if ((!($perms & CHMOD_READ) || is_readable($filename)) && (!($perms & CHMOD_WRITE) || is_writable($filename))) + if ((!($perms & CHMOD_READ) || is_readable($filename)) && (!($perms & CHMOD_WRITE) || phpbb_is_writable($filename))) { break; } @@ -738,7 +738,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ) clearstatcache(); - if ((!($perms & CHMOD_READ) || is_readable($filename)) && (!($perms & CHMOD_WRITE) || is_writable($filename))) + if ((!($perms & CHMOD_READ) || is_readable($filename)) && (!($perms & CHMOD_WRITE) || phpbb_is_writable($filename))) { break; } |