diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:25:05 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:25:05 +0200 |
| commit | dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c (patch) | |
| tree | 9619c778091fe479ec69a20f946fad47470345aa /phpBB/includes/acm/acm_memory.php | |
| parent | 3c02a1cff70641ae3f5276863242452b6ab06092 (diff) | |
| parent | 5e330044b87190dcdb66aa3c83932a4c16627692 (diff) | |
| download | forums-dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c.tar forums-dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c.tar.gz forums-dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c.tar.bz2 forums-dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c.tar.xz forums-dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c.zip | |
Merge branch 'ticket/nickvergessen/9519' into develop-olympus
* ticket/nickvergessen/9519:
[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/acm/acm_memory.php')
| -rw-r--r-- | phpBB/includes/acm/acm_memory.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/acm/acm_memory.php b/phpBB/includes/acm/acm_memory.php index efbfd4dd62..2936ea0bae 100644 --- a/phpBB/includes/acm/acm_memory.php +++ b/phpBB/includes/acm/acm_memory.php @@ -407,7 +407,13 @@ class acm_memory */ function remove_file($filename, $check = false) { - if ($check && !@is_writable($this->cache_dir)) + if (!function_exists('phpbb_is_writable')) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/functions.' . $phpEx); + } + + if ($check && !phpbb_is_writable($this->cache_dir)) { // E_USER_ERROR - not using language entry - intended. trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR); |