http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97973
Revision: 97973
Author: catrope
Date: 2011-09-23 23:10:10 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Address the fact that User::newFromName() doesn't work the way I thought it
did: it returns false for IPs rather than an anonymous User object
Modified Paths:
--------------
trunk/extensions/MoodBar/ApiQueryMoodBarComments.php
trunk/extensions/MoodBar/SpecialMoodBarFeedback.php
Modified: trunk/extensions/MoodBar/ApiQueryMoodBarComments.php
===================================================================
--- trunk/extensions/MoodBar/ApiQueryMoodBarComments.php 2011-09-23
23:02:06 UTC (rev 97972)
+++ trunk/extensions/MoodBar/ApiQueryMoodBarComments.php 2011-09-23
23:10:10 UTC (rev 97973)
@@ -26,7 +26,7 @@
}
}
if ( $params['user'] !== null ) {
- $user = User::newFromName( $params['user'] );
+ $user = User::newFromName( $params['user'] ); //
returns false for IPs
if ( !$user || $user->isAnon() ) {
$this->addWhereFld( 'mbf_user_id', 0 );
$this->addWhereFld( 'mbf_user_ip',
$params['user'] );
Modified: trunk/extensions/MoodBar/SpecialMoodBarFeedback.php
===================================================================
--- trunk/extensions/MoodBar/SpecialMoodBarFeedback.php 2011-09-23 23:02:06 UTC
(rev 97972)
+++ trunk/extensions/MoodBar/SpecialMoodBarFeedback.php 2011-09-23 23:10:10 UTC
(rev 97973)
@@ -20,10 +20,7 @@
}
$username = strval( $wgRequest->getVal( 'username' ) );
if ( $username !== '' ) {
- $user = User::newFromName( $username );
- if ( $user ) {
- $filters['user'] = $user;
- }
+ $filters['username'] = $username;
}
// Do the query
$res = $this->doQuery( $filters );
@@ -133,12 +130,13 @@
if ( isset( $filters['type'] ) ) {
$conds['mbf_type'] = $filters['type'];
}
- if ( isset( $filters['user'] ) ) {
- if ( $filters['user']->isAnon() ) {
+ if ( isset( $filters['username'] ) ) {
+ $user = User::newFromName( $filters['username'] ); //
Returns false for IPs
+ if ( !$user || $user->isAnon() ) {
$conds['mbf_user_id'] = 0;
- $conds['mbf_user_ip'] =
$filters['user']->getName();
+ $conds['mbf_user_ip'] = $filters['username'];
} else {
- $conds['mbf_user_id'] =
$filters['user']->getID();
+ $conds['mbf_user_id'] = $user->getID();
$conds[] = 'mbf_user_ip IS NULL';
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
