diff options
| author | RMcGirr83 <rmcgirr83@gmail.com> | 2015-03-04 14:20:27 -0500 |
|---|---|---|
| committer | RMcGirr83 <rmcgirr83@gmail.com> | 2015-03-04 14:20:27 -0500 |
| commit | 4618a3e2f83d7967f41bef52a2e996b610febfbb (patch) | |
| tree | 8f215bdd555b96e7683e74d102dd4d88a8ed79b1 /phpBB/phpbb/cache/driver | |
| parent | 5cd4941c55d543ecae0a4fdc2fe165921d1dca1b (diff) | |
| download | forums-4618a3e2f83d7967f41bef52a2e996b610febfbb.tar forums-4618a3e2f83d7967f41bef52a2e996b610febfbb.tar.gz forums-4618a3e2f83d7967f41bef52a2e996b610febfbb.tar.bz2 forums-4618a3e2f83d7967f41bef52a2e996b610febfbb.tar.xz forums-4618a3e2f83d7967f41bef52a2e996b610febfbb.zip | |
[ticket/13477] rename function and fix doc blocks
PHPBB3-13477
Diffstat (limited to 'phpBB/phpbb/cache/driver')
| -rw-r--r-- | phpBB/phpbb/cache/driver/file.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php index bc8da19401..9a7c4aec7f 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -279,7 +279,7 @@ class file extends \phpbb\cache\driver\base if ($var_name[0] == '_') { global $phpEx; - $var_name = $this->replace_slashes($var_name); + $var_name = $this->clean_varname($var_name); return file_exists($this->cache_dir . 'data' . $var_name . ".$phpEx"); } else @@ -335,7 +335,7 @@ class file extends \phpbb\cache\driver\base { global $phpEx; - $filename = $this->replace_slashes($filename); + $filename = $this->clean_varname($filename); $file = "{$this->cache_dir}$filename.$phpEx"; $type = substr($filename, 0, strpos($filename, '_')); @@ -518,7 +518,7 @@ class file extends \phpbb\cache\driver\base { global $phpEx; - $filename = $this->replace_slashes($filename); + $filename = $this->clean_varname($filename); $file = "{$this->cache_dir}$filename.$phpEx"; $lock = new \phpbb\lock\flock($file); @@ -591,11 +591,11 @@ class file extends \phpbb\cache\driver\base /** * Replace slashes in the file name * - * @param string $name filename - * @return string the corrected name + * @param string $varname name of a cache variable + * @return string $varname name that is safe to use as a filename */ - function replace_slashes($name) + protected function clean_varname($varname) { - return str_replace('/', '-', $name); + return str_replace('/', '-', $varname); } } |