From 8e494d75991394d10412870d42e1874f8fe8e754 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 21 Jun 2008 14:30:34 +0000 Subject: [PATCH] #s29325 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8661 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 3 ++- phpBB/includes/session.php | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index da25ae64ab..019bdb496c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -72,7 +72,7 @@ - +

1. Changelog

@@ -122,6 +122,7 @@
  • [Fix] Correctly fetch server name if using non-standard port (#27395)
  • [Fix] Regular expression for email matching in posts will no longer die on long words.
  • [Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)
  • +
  • [Fix] Do not display ban message if direct call to cron. (thanks Dog Cow for reporting)
  • 1.ii. Changes since 3.0.0

    diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 8a3a16727e..734fbaa070 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1124,6 +1124,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); }