aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-04-24 17:41:27 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2013-04-24 17:46:00 -0500
commitf49993766e2bcf4efe346e29972f3721b1b1438a (patch)
treec845ccfef7a27e1da4375ad5a46667d2a04743a3
parentc870b9f43be073a766e4380857415e011b5ed7ef (diff)
downloadforums-f49993766e2bcf4efe346e29972f3721b1b1438a.tar
forums-f49993766e2bcf4efe346e29972f3721b1b1438a.tar.gz
forums-f49993766e2bcf4efe346e29972f3721b1b1438a.tar.bz2
forums-f49993766e2bcf4efe346e29972f3721b1b1438a.tar.xz
forums-f49993766e2bcf4efe346e29972f3721b1b1438a.zip
[ticket/11335] (more) Make php_ext 'php' not '.php'
PHPBB3-11335
-rw-r--r--phpBB/includes/acp/acp_extensions.php2
-rw-r--r--tests/extension/manager_test.php2
-rw-r--r--tests/test_framework/phpbb_functional_test_case.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index e4f8059b45..9b5a8da3aa 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -54,7 +54,7 @@ class acp_extensions
// If they've specified an extension, let's load the metadata manager and validate it.
if ($ext_name)
{
- $md_manager = new phpbb_extension_metadata_manager($ext_name, $db, $phpbb_extension_manager, $phpbb_root_path, ".$phpEx", $template, $config);
+ $md_manager = new phpbb_extension_metadata_manager($ext_name, $db, $phpbb_extension_manager, $phpbb_root_path, "$phpEx", $template, $config);
try
{
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index d6bcb97586..106f078691 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -115,7 +115,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
new phpbb_filesystem(),
'phpbb_ext',
dirname(__FILE__) . '/',
- '.' . $php_ext,
+ $php_ext,
($with_cache) ? new phpbb_mock_cache() : null
);
}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index b9647e4742..5534de89c9 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -156,7 +156,7 @@ class phpbb_functional_test_case extends phpbb_test_case
new phpbb_filesystem(),
self::$config['table_prefix'] . 'ext',
dirname(__FILE__) . '/',
- '.' . $php_ext,
+ $php_ext,
$this->get_cache_driver()
);