makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge in r9145

Browse source 
git-svn-id: file:///svn/phpbb/trunk@9147 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith 2008-12-01 17:28:32 +00:00
parent b68a102491
commit 45ac6aba10
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/functions.php
View file

@ -914,7 +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); clearstatcache();
$file_uid = fileowner($filename); $file_uid = fileowner($filename);
} }
} }
@ -924,7 +924,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ)
{ {
if (@chgrp($filename, $common_php_group)); if (@chgrp($filename, $common_php_group));
{ {
clearstatcache(false, $filename); clearstatcache();
$file_gid = filegroup($filename); $file_gid = filegroup($filename);
} }
} }
@ -973,7 +973,7 @@ 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); clearstatcache();
if (!is_null($php) || (is_readable($filename) && is_writable($filename))) if (!is_null($php) || (is_readable($filename) && is_writable($filename)))
{ {
@ -984,7 +984,7 @@ 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); clearstatcache();
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))))
{ {
@ -994,7 +994,7 @@ 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); clearstatcache();
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))))
{ {

2
phpBB/includes/functions_template.php
View file

@ -835,7 +835,7 @@ class template_compile
phpbb_chmod($filename, CHMOD_WRITE); phpbb_chmod($filename, CHMOD_WRITE);
clearstatcache(false, $filename); clearstatcache();
return true; return true;
} }