diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-07-26 16:12:21 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-07-26 16:12:21 +0200 |
| commit | cec4c94f2edff43508f20d8838399f4114557134 (patch) | |
| tree | a130a5bebdfb2d09de0de9293882ad74d6726333 /phpBB/includes/extension/controller.php | |
| parent | 8a264228d01215fe1020bf946fc95c804ba95450 (diff) | |
| parent | d1e56868667234b4d8ea61a79463c3e3e47efa80 (diff) | |
| download | forums-cec4c94f2edff43508f20d8838399f4114557134.tar forums-cec4c94f2edff43508f20d8838399f4114557134.tar.gz forums-cec4c94f2edff43508f20d8838399f4114557134.tar.bz2 forums-cec4c94f2edff43508f20d8838399f4114557134.tar.xz forums-cec4c94f2edff43508f20d8838399f4114557134.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (39 commits)
[ticket/11025] Add underline for hover to classes
[ticket/11025] Replace <b> with <strong> and/or class for semantic styling in subsilver2
[ticket/11025] Replace <b> with <strong> and/or class for semantic styling
[ticket/11025] Make last topic titles in forum list Bold
[prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
[prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
[ticket/10965] Profile data is only grabbed when show_novalue is enabled
[ticket/10965] Make sure all profile fields are always grabbed on viewtopic
[ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
[ticket/10965] Introduce a new profile field option to display no value
[ticket/10990] Changes for develop
[ticket/10990] Do not use comma separator when storing it as a log.
[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
[ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
[ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
[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
[ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
[ticket/11008] Change onunload_functions to not use eval()
...
Diffstat (limited to 'phpBB/includes/extension/controller.php')
| -rw-r--r-- | phpBB/includes/extension/controller.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/extension/controller.php b/phpBB/includes/extension/controller.php index c7fd439a19..ec051c756f 100644 --- a/phpBB/includes/extension/controller.php +++ b/phpBB/includes/extension/controller.php @@ -50,7 +50,7 @@ abstract class phpbb_extension_controller implements phpbb_extension_controller_ /** * @var string PHP Extension */ - protected $phpEx; + protected $php_ext; /** * @var string Relative path to board root @@ -64,14 +64,14 @@ abstract class phpbb_extension_controller implements phpbb_extension_controller_ public function __construct() { global $request, $db, $user, $template, $config; - global $phpEx, $phpbb_root_path; + global $php_ext, $phpbb_root_path; $this->request = $request; $this->db = $db; $this->user = $user; $this->template = $template; $this->config = $config; - $this->phpEx = $phpEx; + $this->php_ext = $php_ext; $this->phpbb_root_path = $phpbb_root_path; } } |