mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-02 14:57:37 +02:00
Code Issues Releases Wiki Activity

merge in r9144

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@9145 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith
2008-12-01 17:04:58 +00:00
parent be17000b92
commit b68a102491
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/functions.php
View File

@@ -914,6 +914,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ)
// Will most likely not work // Will most likely not work
if (@chown($filename, $common_php_owner)); if (@chown($filename, $common_php_owner));
{ {
clearstatcache(false, $filename);
$file_uid = fileowner($filename); $file_uid = fileowner($filename);
} }
} }
@@ -923,6 +924,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ)
{ {
if (@chgrp($filename, $common_php_group)); if (@chgrp($filename, $common_php_group));
{ {
clearstatcache(false, $filename);
$file_gid = filegroup($filename); $file_gid = filegroup($filename);
} }
} }
@@ -971,6 +973,8 @@ function phpbb_chmod($filename, $perms = CHMOD_READ)
$result = @chmod($filename, ($owner << 6) + (0 << 3) + (0 << 0)); $result = @chmod($filename, ($owner << 6) + (0 << 3) + (0 << 0));
clearstatcache(false, $filename);
if (!is_null($php) || (is_readable($filename) && is_writable($filename))) if (!is_null($php) || (is_readable($filename) && is_writable($filename)))
{ {
break; break;
@@ -980,6 +984,8 @@ function phpbb_chmod($filename, $perms = CHMOD_READ)
case 'group': case 'group':
$result = @chmod($filename, ($owner << 6) + ($perms << 3) + (0 << 0)); $result = @chmod($filename, ($owner << 6) + ($perms << 3) + (0 << 0));
clearstatcache(false, $filename);
if (!is_null($php) || ((!($perms & CHMOD_READ) || is_readable($filename)) && (!($perms & CHMOD_WRITE) || is_writable($filename)))) if (!is_null($php) || ((!($perms & CHMOD_READ) || is_readable($filename)) && (!($perms & CHMOD_WRITE) || is_writable($filename))))
{ {
break; break;
@@ -988,6 +994,8 @@ function phpbb_chmod($filename, $perms = CHMOD_READ)
case 'other': case 'other':
$result = @chmod($filename, ($owner << 6) + ($perms << 3) + ($perms << 0)); $result = @chmod($filename, ($owner << 6) + ($perms << 3) + ($perms << 0));
clearstatcache(false, $filename);
if (!is_null($php) || ((!($perms & CHMOD_READ) || is_readable($filename)) && (!($perms & CHMOD_WRITE) || is_writable($filename)))) if (!is_null($php) || ((!($perms & CHMOD_READ) || is_readable($filename)) && (!($perms & CHMOD_WRITE) || is_writable($filename))))
{ {
break; break;