diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-01 10:29:46 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-01 10:29:46 +0000 |
| commit | 79d159913525d6f361f7664904a13203c9bc3dcc (patch) | |
| tree | 23c415dd96a16be3becefcbbde5ec0ff4dddeb1b /phpBB/includes/session.php | |
| parent | 3f3e9d9bcc169608351d59ad89784d4444b47366 (diff) | |
| download | forums-79d159913525d6f361f7664904a13203c9bc3dcc.tar forums-79d159913525d6f361f7664904a13203c9bc3dcc.tar.gz forums-79d159913525d6f361f7664904a13203c9bc3dcc.tar.bz2 forums-79d159913525d6f361f7664904a13203c9bc3dcc.tar.xz forums-79d159913525d6f361f7664904a13203c9bc3dcc.zip | |
#8358
git-svn-id: file:///svn/phpbb/trunk@7102 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 351d284c62..81fc33c924 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -114,13 +114,6 @@ class session 'page' => $page ); -/* - if (!file_exists($page_name)) - { - trigger_error('You are on a page that does not exist!', E_USER_ERROR); - } -*/ - return $page_array; } @@ -573,7 +566,7 @@ class session WHERE session_id = \'' . $db->sql_escape($this->session_id) . '\' AND session_user_id = ' . ANONYMOUS; - if (!$this->session_id || !$db->sql_query($sql) || !$db->sql_affectedrows()) + if (!defined('IN_ERROR_HANDLER') && (!$this->session_id || !$db->sql_query($sql) || !$db->sql_affectedrows())) { // Limit new sessions in 1 minute period (if required) if ((!isset($this->data['session_time']) || !$this->data['session_time']) && $config['active_sessions']) @@ -1360,6 +1353,12 @@ class user extends session $this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $config['default_lang']; + // If this function got called from the error handler we are finished here. + if (defined('IN_ERROR_HANDLER')) + { + return; + } + // 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')) @@ -1373,7 +1372,6 @@ class user extends session { $message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE'; } - trigger_error($message); } |