diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-07-21 18:16:53 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-07-21 18:21:08 +0200 |
| commit | 83bdf3eeb31d202f6806cacda66d039ae7c74dc2 (patch) | |
| tree | adc05fae806268bf387e8fb9dcdd40d1de3b4401 /tests | |
| parent | 65bafb22810038fd51e22fd8168775afd86c2e74 (diff) | |
| parent | cc0aa90c49f99288cbda33519178a8042f1e4a71 (diff) | |
| download | forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar.gz forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar.bz2 forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar.xz forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.zip | |
Merge branch 'develop' into ticket/11015
* 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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mock/extension_manager.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php index 77f799dd3b..fdda4cbadc 100644 --- a/tests/mock/extension_manager.php +++ b/tests/mock/extension_manager.php @@ -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; } } |