Merge "Make MOVED_TO* var generating from RecentChanges working"

This commit is contained in:
jenkins-bot 2014-01-19 23:54:15 +00:00 committed by Gerrit Code Review
commit cb7dc7fa63

View file

@ -1973,8 +1973,6 @@ class AbuseFilter {
* @return AbuseFilterVariableHolder
*/
public static function getMoveVarsFromRCRow( $row ) {
$vars = new AbuseFilterVariableHolder;
if ( $row->rc_user ) {
$user = User::newFromId( $row->rc_user );
} else {
@ -1982,13 +1980,12 @@ class AbuseFilter {
$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' )