diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-21 14:30:34 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-21 14:30:34 +0000 |
| commit | 8e494d75991394d10412870d42e1874f8fe8e754 (patch) | |
| tree | 0628799950270a95d065e6d3bb4583688a636fa0 /phpBB | |
| parent | 230eb5a01853fae0ca57bf05e5b74bd8c5d2b9b7 (diff) | |
| download | forums-8e494d75991394d10412870d42e1874f8fe8e754.tar forums-8e494d75991394d10412870d42e1874f8fe8e754.tar.gz forums-8e494d75991394d10412870d42e1874f8fe8e754.tar.bz2 forums-8e494d75991394d10412870d42e1874f8fe8e754.tar.xz forums-8e494d75991394d10412870d42e1874f8fe8e754.zip | |
#s29325
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8661 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 8 |
2 files changed, 10 insertions, 1 deletions
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 @@ <span class="corners-bottom"><span></span></span></div> </div> - + <hr /> <a name="changelog"></a><h2>1. Changelog</h2> @@ -122,6 +122,7 @@ <li>[Fix] Correctly fetch server name if using non-standard port (#27395)</li> <li>[Fix] Regular expression for email matching in posts will no longer die on long words.</li> <li>[Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)</li> + <li>[Fix] Do not display ban message if direct call to cron. (thanks Dog Cow for reporting)</li> </ul> <a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3> 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); } |