aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2008-12-01 17:28:32 +0000
committerChris Smith <toonarmy@phpbb.com>2008-12-01 17:28:32 +0000
commit45ac6aba10a84a82c6c64839772992bc62afbf93 (patch)
tree936743f73d4463f3e968aabd7f6476a368afcd2a
parentb68a10249110a3248404956b7b532bbf976f7ae6 (diff)
downloadforums-45ac6aba10a84a82c6c64839772992bc62afbf93.tar
forums-45ac6aba10a84a82c6c64839772992bc62afbf93.tar.gz
forums-45ac6aba10a84a82c6c64839772992bc62afbf93.tar.bz2
forums-45ac6aba10a84a82c6c64839772992bc62afbf93.tar.xz
forums-45ac6aba10a84a82c6c64839772992bc62afbf93.zip
merge in r9145
git-svn-id: file:///svn/phpbb/trunk@9147 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/functions.php10
-rw-r--r--phpBB/includes/functions_template.php2
2 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index ed0673d071..9ba6e9a367 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -914,7 +914,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ)
// Will most likely not work
if (@chown($filename, $common_php_owner));
{
- clearstatcache(false, $filename);
+ clearstatcache();
$file_uid = fileowner($filename);
}
}
@@ -924,7 +924,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ)
{
if (@chgrp($filename, $common_php_group));
{
- clearstatcache(false, $filename);
+ clearstatcache();
$file_gid = filegroup($filename);
}
}
@@ -973,7 +973,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ)
$result = @chmod($filename, ($owner << 6) + (0 << 3) + (0 << 0));
- clearstatcache(false, $filename);
+ clearstatcache();
if (!is_null($php) || (is_readable($filename) && is_writable($filename)))
{
@@ -984,7 +984,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ)
case 'group':
$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))))
{
@@ -994,7 +994,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ)
case 'other':
$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))))
{
diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php
index ee5c7d7b72..4e2836590e 100644
--- a/phpBB/includes/functions_template.php
+++ b/phpBB/includes/functions_template.php
@@ -835,7 +835,7 @@ class template_compile
phpbb_chmod($filename, CHMOD_WRITE);
- clearstatcache(false, $filename);
+ clearstatcache();
return true;
}