http://www.mediawiki.org/wiki/Special:Code/MediaWiki/67472
Revision: 67472 Author: ashley Date: 2010-06-06 17:41:22 +0000 (Sun, 06 Jun 2010) Log Message: ----------- SocialProfile: ignore log actions (user rights, block, etc.) in siteactivity tag. Blocking a user is not the same thing as editing their user page, obviously. Modified Paths: -------------- trunk/extensions/SocialProfile/UserActivity/UserActivity.body.php trunk/extensions/SocialProfile/UserActivity/UserActivityClass.php Modified: trunk/extensions/SocialProfile/UserActivity/UserActivity.body.php =================================================================== --- trunk/extensions/SocialProfile/UserActivity/UserActivity.body.php 2010-06-06 16:29:09 UTC (rev 67471) +++ trunk/extensions/SocialProfile/UserActivity/UserActivity.body.php 2010-06-06 17:41:22 UTC (rev 67472) @@ -22,8 +22,6 @@ $wgOut->setPageTitle( wfMsg( 'useractivity-title' ) ); - $this_title = SpecialPage::getTitleFor( 'UserActivity' ); - $output = ''; $rel_type = $wgRequest->getVal( 'rel_type' ); @@ -94,7 +92,7 @@ $typeIcon = UserActivity::getTypeIcon( $item['type'] ); $output .= "<div class=\"user-home-activity{$border_fix}\"> <img src=\"{$wgScriptPath}/extensions/SocialProfile/images/" . $typeIcon . "\" alt=\"\" border=\"0\" /> - {$item["data"]} + {$item['data']} </div>"; $x++; } Modified: trunk/extensions/SocialProfile/UserActivity/UserActivityClass.php =================================================================== --- trunk/extensions/SocialProfile/UserActivity/UserActivityClass.php 2010-06-06 16:29:09 UTC (rev 67471) +++ trunk/extensions/SocialProfile/UserActivity/UserActivityClass.php 2010-06-06 17:41:22 UTC (rev 67472) @@ -77,7 +77,8 @@ $sql = "SELECT UNIX_TIMESTAMP(rc_timestamp) AS item_date, rc_title, rc_user, rc_user_text, rc_comment, rc_id, rc_minor, rc_new, - rc_namespace, rc_cur_id, rc_this_oldid, rc_last_oldid + rc_namespace, rc_cur_id, rc_this_oldid, rc_last_oldid, + rc_log_action FROM {$dbr->tableName( 'recentchanges' )} {$rel_sql} {$user_sql} ORDER BY rc_id DESC LIMIT 0," . $this->item_max; @@ -85,7 +86,9 @@ foreach ( $res as $row ) { // Special pages aren't editable, so ignore them - if ( $row->rc_namespace == NS_SPECIAL ) { + // And blocking a vandal should not be counted as editing said + // vandal's user page... + if ( $row->rc_namespace == NS_SPECIAL || $row->rc_log_action != null ) { continue; } $title = Title::makeTitle( $row->rc_namespace, $row->rc_title ); _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs