mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into ticket/11015

Browse Source 
* develop:
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
  [ticket/11002] Use translating option to rename the Etc/GMT options

Conflicts:
	phpBB/includes/extension/manager.php
This commit is contained in:
Igor Wiedler
2012-07-21 18:16:53 +02:00
parent 65bafb2281 cc0aa90c49
commit 83bdf3eeb3
9 changed files with 98 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/mock/extension_manager.php
View File

@@ -12,7 +12,7 @@ class phpbb_mock_extension_manager extends phpbb_extension_manager
public function __construct($phpbb_root_path, $extensions = array())
{
$this->phpbb_root_path = $phpbb_root_path;
$this->phpEx = '.php';
$this->php_ext = '.php';
$this->extensions = $extensions;
}
}