wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-24 06:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Avoid calls to deprecated wfSetupSession, $_SESSION, and session_id"

Browse source
This commit is contained in:
jenkins-bot 2018-03-27 02:36:25 +00:00 committed by Gerrit Code Review
parent 842990b81c 1d348e148e
commit e268f6b3e1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/AbuseFilter.class.php
View file

@ -2,6 +2,7 @@
use MediaWiki\Linker\LinkRenderer;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\Session\SessionManager;
use MediaWiki\MediaWikiServices;
use Wikimedia\Rdbms\IDatabase;
@ -846,12 +847,11 @@ class AbuseFilter {
$warnKey = 'abusefilter-warned-' . md5( $title->getPrefixedText() ) . '-' . $filter;
// Make sure the session is started prior to using it
if ( session_id() === '' ) {
wfSetupSession();
}
$session = SessionManager::getGlobalSession();
$session->persist();
if ( !isset( $_SESSION[$warnKey] ) || !$_SESSION[$warnKey] ) {
$_SESSION[$warnKey] = true;
if ( !isset( $session[$warnKey] ) || !$session[$warnKey] ) {
$session[$warnKey] = true;
// Threaten them a little bit
if ( !empty( $parameters[0] ) && strlen( $parameters[0] ) ) {
@ -866,7 +866,7 @@ class AbuseFilter {
continue; // Don't do anything else.
} else {
// We already warned them
$_SESSION[$warnKey] = false;
$session[$warnKey] = false;
}
unset( $actions['warn'] );