diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-11 04:42:06 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-11 04:42:06 -0600 |
| commit | 84ba10ec8c023ab307eb7d0b829ab337aaaae78e (patch) | |
| tree | 468abf9fbb513cba53803ca29c6b65fd4ea497ec /phpBB/includes/user.php | |
| parent | 106daa09ebb5b12bf9892c41f8c1de627cf6b0e9 (diff) | |
| parent | e86ecc0f3bd6383d31a670896720a970b8faaaa9 (diff) | |
| download | forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.gz forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.bz2 forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.xz forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.zip | |
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/includes/user.php')
| -rw-r--r-- | phpBB/includes/user.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php index 93557f3558..9ddd806b27 100644 --- a/phpBB/includes/user.php +++ b/phpBB/includes/user.php @@ -162,8 +162,8 @@ class phpbb_user extends phpbb_session // We include common language file here to not load it every time a custom language file is included $lang = &$this->lang; - // Do not suppress error if in DEBUG_EXTRA mode - $include_result = (defined('DEBUG_EXTRA')) ? (include $this->lang_path . $this->lang_name . "/common.$phpEx") : (@include $this->lang_path . $this->lang_name . "/common.$phpEx"); + // Do not suppress error if in DEBUG mode + $include_result = (defined('DEBUG')) ? (include $this->lang_path . $this->lang_name . "/common.$phpEx") : (@include $this->lang_path . $this->lang_name . "/common.$phpEx"); if ($include_result === false) { @@ -252,7 +252,7 @@ class phpbb_user extends phpbb_session // Disable board if the install/ directory is still present // For the brave development army we do not care about this, else we need to comment out this everytime we develop locally - if (!defined('DEBUG_EXTRA') && !defined('ADMIN_START') && !defined('IN_INSTALL') && !defined('IN_LOGIN') && file_exists($phpbb_root_path . 'install') && !is_file($phpbb_root_path . 'install')) + if (!defined('DEBUG') && !defined('ADMIN_START') && !defined('IN_INSTALL') && !defined('IN_LOGIN') && file_exists($phpbb_root_path . 'install') && !is_file($phpbb_root_path . 'install')) { // Adjust the message slightly according to the permissions if ($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) @@ -618,8 +618,8 @@ class phpbb_user extends phpbb_session return; } - // Do not suppress error if in DEBUG_EXTRA mode - $include_result = (defined('DEBUG_EXTRA')) ? (include $language_filename) : (@include $language_filename); + // Do not suppress error if in DEBUG mode + $include_result = (defined('DEBUG')) ? (include $language_filename) : (@include $language_filename); if ($include_result === false) { |