makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bug/kellanved/59425' into develop-olympus

Browse source 
* bug/kellanved/59425:
  [bug/59425] Correctly check for double inclusion in captcha garbage collection
This commit is contained in:
Nils Adermann 2010-03-28 15:09:09 +02:00
commit e35392cb4f
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -101,6 +101,7 @@
<li>[Fix] Minor language fixes. (Bug #54855)</li> <li>[Fix] Minor language fixes. (Bug #54855)</li>
<li>[Fix] Parsing urls in signatures properly uses config settings. (Bug #57105)</li> <li>[Fix] Parsing urls in signatures properly uses config settings. (Bug #57105)</li>
<li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li> <li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li>
<li>[Fix] Fix inclusion check for captcha garbage collection (Bug #59425)</li>
<li>[Fix] Prevent wrong tar archive type detection. (Bug #12531)</li> <li>[Fix] Prevent wrong tar archive type detection. (Bug #12531)</li>
<li>[Fix] Correct redirection after login to forum not in web root (Bug #58755)</li> <li>[Fix] Correct redirection after login to forum not in web root (Bug #58755)</li>
<li>[Fix] Allow setting parent forums regardless of permission settings. (Bug #57415)</li> <li>[Fix] Allow setting parent forums regardless of permission settings. (Bug #57415)</li>

2
phpBB/includes/session.php
View file

@ -983,7 +983,7 @@ class session
} }
// only called from CRON; should be a safe workaround until the infrastructure gets going // only called from CRON; should be a safe workaround until the infrastructure gets going
if (!class_exists('captcha_factory')) if (!class_exists('phpbb_captcha_factory'))
{ {
include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx); include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx);
} }