https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112844
Revision: 112844 Author: aaron Date: 2012-03-01 22:11:49 +0000 (Thu, 01 Mar 2012) Log Message: ----------- MFT r112843 Modified Paths: -------------- branches/wmf/1.19wmf1/includes/specials/SpecialContributions.php Property Changed: ---------------- branches/wmf/1.19wmf1/ branches/wmf/1.19wmf1/includes/ branches/wmf/1.19wmf1/includes/specials/ Property changes on: branches/wmf/1.19wmf1 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/JSTesting:100352-107913 /branches/REL1_15/phase3:51646 /branches/REL1_17/phase3:81445,81448 /branches/new-installer/phase3:43664-66004 /branches/sqlite:58211-58321 /branches/wmf/1.18wmf1:97508,111667 /trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169-112170,112172-112173,112179,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563,112566,112700,112750,112839-112840 + /branches/JSTesting:100352-107913 /branches/REL1_15/phase3:51646 /branches/REL1_17/phase3:81445,81448 /branches/new-installer/phase3:43664-66004 /branches/sqlite:58211-58321 /branches/wmf/1.18wmf1:97508,111667 /trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169-112170,112172-112173,112179,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563,112566,112700,112750,112839-112840,112843 Property changes on: branches/wmf/1.19wmf1/includes ___________________________________________________________________ Modified: svn:mergeinfo - /branches/JSTesting/includes:100352-107913 /branches/REL1_15/phase3/includes:51646 /branches/new-installer/phase3/includes:43664-66004 /branches/sqlite/includes:58211-58321 /branches/wmf/1.18wmf1/includes:97508,111667 /branches/wmf-deployment/includes:53381 /trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526,112534,112563,112700,112839-112840 + /branches/JSTesting/includes:100352-107913 /branches/REL1_15/phase3/includes:51646 /branches/new-installer/phase3/includes:43664-66004 /branches/sqlite/includes:58211-58321 /branches/wmf/1.18wmf1/includes:97508,111667 /branches/wmf-deployment/includes:53381 /trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526,112534,112563,112700,112839-112840,112843 Property changes on: branches/wmf/1.19wmf1/includes/specials ___________________________________________________________________ Modified: svn:mergeinfo - /branches/JSTesting/includes/specials:100352-107913 /branches/REL1_15/phase3/includes/specials:51646 /branches/sqlite/includes/specials:58211-58321 /branches/wmf-deployment/includes/specials:53381,56967 /trunk/phase3/includes/specials:111085,111128,111144,111251,111750,112397,112408,112474 + /branches/JSTesting/includes/specials:100352-107913 /branches/REL1_15/phase3/includes/specials:51646 /branches/sqlite/includes/specials:58211-58321 /branches/wmf-deployment/includes/specials:53381,56967 /trunk/phase3/includes/specials:111085,111128,111144,111251,111750,112397,112408,112474,112843 Modified: branches/wmf/1.19wmf1/includes/specials/SpecialContributions.php =================================================================== --- branches/wmf/1.19wmf1/includes/specials/SpecialContributions.php 2012-03-01 22:10:12 UTC (rev 112843) +++ branches/wmf/1.19wmf1/includes/specials/SpecialContributions.php 2012-03-01 22:11:49 UTC (rev 112844) @@ -628,13 +628,14 @@ # @todo FIXME: Other groups may have 'bot' rights $join_conds['user_groups'] = array( 'LEFT JOIN', "ug_user = rev_user AND ug_group = 'bot'" ); } else { - if ( IP::isIPAddress( $this->target ) ) { + $uid = User::idFromName( $this->target ); + if ( $uid ) { + $condition['rev_user'] = $uid; + $index = 'user_timestamp'; + } else { $condition['rev_user_text'] = $this->target; $index = 'usertext_timestamp'; - } else { - $condition['rev_user'] = User::idFromName( $this->target ); - $index = 'user_timestamp'; - } + } } if ( $this->deletedOnly ) { $condition[] = "rev_deleted != '0'"; _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs