jenkins-bot has submitted this change and it was merged.

Change subject: Make MOVED_TO* var generating from RecentChanges working
......................................................................


Make MOVED_TO* var generating from RecentChanges working

This patch fixes the generation of MOVED_TO vars from
recentchanges rows.

Change-Id: I6c5471620a0fb5cb78b946fc162ff3d6a30b0e0e
---
M AbuseFilter.class.php
1 file changed, 2 insertions(+), 5 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 24d9080..707bcd9 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -1965,8 +1965,6 @@
         * @return AbuseFilterVariableHolder
         */
        public static function getMoveVarsFromRCRow( $row ) {
-               $vars = new AbuseFilterVariableHolder;
-
                if ( $row->rc_user ) {
                        $user = User::newFromId( $row->rc_user );
                } else {
@@ -1974,13 +1972,12 @@
                        $user->setName( $row->rc_user_text );
                }
 
-               $params = explode( "\n", trim( $row->rc_params ) );
+               $params = array_values( DatabaseLogEntry::newFromRow( $row 
)->getParameters() );
 
                $oldTitle = Title::makeTitle( $row->rc_namespace, 
$row->rc_title );
-               $newTitle = Title::newFromText( $params[0] );
+               $newTitle = Title::makeTitle( $params[1], $params[0] );
 
                $vars = AbuseFilterVariableHolder::merge(
-                       $vars,
                        AbuseFilter::generateUserVars( $user ),
                        AbuseFilter::generateTitleVars( $oldTitle, 'MOVED_FROM' 
),
                        AbuseFilter::generateTitleVars( $newTitle, 'MOVED_TO' )

-- 
To view, visit https://gerrit.wikimedia.org/r/104706
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c5471620a0fb5cb78b946fc162ff3d6a30b0e0e
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Nullzero <nullzero.f...@gmail.com>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Nullzero <nullzero.f...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Werdna <agarr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to