diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-23 18:22:44 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-23 18:22:44 +0000 |
| commit | ad739a358ca7b593fc5f2bfc77e2058b4ea59163 (patch) | |
| tree | 0190f40f45cf190dfc5a2a1e0053fa899c14ddce /phpBB/includes/session.php | |
| parent | 3892e7330adb2464293428e58f882f7d18fc8558 (diff) | |
| download | forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar.gz forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar.bz2 forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.tar.xz forums-ad739a358ca7b593fc5f2bfc77e2058b4ea59163.zip | |
merge? merge.
git-svn-id: file:///svn/phpbb/trunk@8672 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index a3a3a60061..14c21714d5 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1113,6 +1113,14 @@ class session // To circumvent session_begin returning a valid value and the check_ban() not called on second page view, we kill the session again $this->session_kill(false); + // A very special case... we are within the cron script which is not supposed to print out the ban message... show blank page + if (defined('IN_CRON')) + { + garbage_collection(); + exit_handler(); + exit; + } + trigger_error($message); } @@ -1582,6 +1590,7 @@ class user extends session $localised_images = true; } + $row['image_filename'] = rawurlencode($row['image_filename']); $this->img_array[$row['image_name']] = $row; } $db->sql_freeresult($result); |