diff options
author | Igor Wiedler <igor@wiedler.ch> | 2012-11-12 22:26:36 +0100 |
---|---|---|
committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-12 22:26:36 +0100 |
commit | 904b2f5d7f472e479086f2016b73e56ad10f125f (patch) | |
tree | 749aac7c431eeb2b18273dd42b02428379da203a | |
parent | 5a5e507a14084b08e41c4d2f86f2fb6700e68eb5 (diff) | |
parent | d33aaac199bf1305d37b49a83b91a1bd014ea6cd (diff) | |
download | forums-904b2f5d7f472e479086f2016b73e56ad10f125f.tar forums-904b2f5d7f472e479086f2016b73e56ad10f125f.tar.gz forums-904b2f5d7f472e479086f2016b73e56ad10f125f.tar.bz2 forums-904b2f5d7f472e479086f2016b73e56ad10f125f.tar.xz forums-904b2f5d7f472e479086f2016b73e56ad10f125f.zip |
Merge remote-tracking branch 'imkingdavid/ticket/11195' into develop
* imkingdavid/ticket/11195:
[ticket/11195] Condense logic, remove improperly formatted if()
-rw-r--r-- | phpBB/includes/functions_container.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 1de1d9f7ea..1763d1082a 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -126,11 +126,8 @@ function phpbb_create_dumped_container(array $extensions, array $passes, $phpbb_ function phpbb_create_dumped_container_unless_debug(array $extensions, array $passes, $phpbb_root_path, $php_ext) { - if (defined('DEBUG')) { - return phpbb_create_compiled_container($extensions, $passes, $phpbb_root_path, $php_ext); - } - - return phpbb_create_dumped_container($extensions, $passes, $phpbb_root_path, $php_ext); + $container_factory = defined('DEBUG') ? 'phpbb_create_compiled_container' : 'phpbb_create_dumped_container'; + return $container_factory($extensions, $passes, $phpbb_root_path, $php_ext); } function phpbb_container_filename($phpbb_root_path, $php_ext) |