diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-07-24 13:37:46 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-07-24 13:37:46 -0400 |
| commit | e116561348b7bd3400bfe6acccf5eebaaaa7f562 (patch) | |
| tree | a42f4d5f04823a5bf44556699dd9259e1e443de3 | |
| parent | ee203b46328f3a0e1297197e50b30487d1eab248 (diff) | |
| download | forums-e116561348b7bd3400bfe6acccf5eebaaaa7f562.tar forums-e116561348b7bd3400bfe6acccf5eebaaaa7f562.tar.gz forums-e116561348b7bd3400bfe6acccf5eebaaaa7f562.tar.bz2 forums-e116561348b7bd3400bfe6acccf5eebaaaa7f562.tar.xz forums-e116561348b7bd3400bfe6acccf5eebaaaa7f562.zip | |
[feature/template-engine] Rename is_absolute to phpbb_is_absolute.
PHPBB3-9726
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/template/template.php | 2 | ||||
| -rw-r--r-- | tests/template/includephp_test.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 86c6bc2505..e4727b9705 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -752,7 +752,7 @@ function phpbb_is_writable($file) * @param string $path Path to check absoluteness of * @return boolean */ -function is_absolute($path) +function phpbb_is_absolute($path) { return ($path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:[/\\\]#i', $path))) ? true : false; } @@ -772,7 +772,7 @@ function phpbb_own_realpath($path) $path_prefix = ''; // Determine what sort of path we have - if (is_absolute($path)) + if (phpbb_is_absolute($path)) { $absolute = true; diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index c16eddc426..010284edf3 100644 --- a/phpBB/includes/template/template.php +++ b/phpBB/includes/template/template.php @@ -526,7 +526,7 @@ class phpbb_template */ public function _php_include($filename) { - if (is_absolute($filename)) + if (phpbb_is_absolute($filename)) { $file = $filename; } diff --git a/tests/template/includephp_test.php b/tests/template/includephp_test.php index 64240e1be8..aac9cccc8a 100644 --- a/tests/template/includephp_test.php +++ b/tests/template/includephp_test.php @@ -26,7 +26,7 @@ class phpbb_template_includephp_test extends phpbb_template_template_test_case public function test_includephp_absolute() { $path_to_php = dirname(__FILE__) . '/templates/_dummy_include.php.inc'; - $this->assertTrue(is_absolute($path_to_php)); + $this->assertTrue(phpbb_is_absolute($path_to_php)); $template_text = "Path is absolute.\n<!-- INCLUDEPHP $path_to_php -->"; $cache_dir = dirname($this->template->cachepath) . '/'; |