diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-28 15:09:09 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-28 15:09:09 +0200 |
| commit | e35392cb4f86738cb8daa80d43c1e80558cf3edc (patch) | |
| tree | a682b4d6f8a9c3b220955063758ebdc76e9592a2 /phpBB | |
| parent | b111e4d9271fcb62f427a93707d8af894169df71 (diff) | |
| parent | 9be61f9e53fef972e8f3b37186050814a9488790 (diff) | |
| download | forums-e35392cb4f86738cb8daa80d43c1e80558cf3edc.tar forums-e35392cb4f86738cb8daa80d43c1e80558cf3edc.tar.gz forums-e35392cb4f86738cb8daa80d43c1e80558cf3edc.tar.bz2 forums-e35392cb4f86738cb8daa80d43c1e80558cf3edc.tar.xz forums-e35392cb4f86738cb8daa80d43c1e80558cf3edc.zip | |
Merge branch 'bug/kellanved/59425' into develop-olympus
* bug/kellanved/59425:
[bug/59425] Correctly check for double inclusion in captcha garbage collection
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index fabf2dad4f..5e6a0dbd86 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -101,6 +101,7 @@ <li>[Fix] Minor language fixes. (Bug #54855)</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] Fix inclusion check for captcha garbage collection (Bug #59425)</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] Allow setting parent forums regardless of permission settings. (Bug #57415)</li> diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 8beb0161f9..0a01b4e73b 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -983,7 +983,7 @@ class session } // 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); } |