| Index: trunk/extensions/MoodBar/ApiQueryMoodBarComments.php |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | if ( $params['user'] !== null ) { |
| 30 | | - $user = User::newFromName( $params['user'] ); |
| | 30 | + $user = User::newFromName( $params['user'] ); // returns false for IPs |
| 31 | 31 | if ( !$user || $user->isAnon() ) { |
| 32 | 32 | $this->addWhereFld( 'mbf_user_id', 0 ); |
| 33 | 33 | $this->addWhereFld( 'mbf_user_ip', $params['user'] ); |
| Index: trunk/extensions/MoodBar/SpecialMoodBarFeedback.php |
| — | — | @@ -20,10 +20,7 @@ |
| 21 | 21 | } |
| 22 | 22 | $username = strval( $wgRequest->getVal( 'username' ) ); |
| 23 | 23 | if ( $username !== '' ) { |
| 24 | | - $user = User::newFromName( $username ); |
| 25 | | - if ( $user ) { |
| 26 | | - $filters['user'] = $user; |
| 27 | | - } |
| | 24 | + $filters['username'] = $username; |
| 28 | 25 | } |
| 29 | 26 | // Do the query |
| 30 | 27 | $res = $this->doQuery( $filters ); |
| — | — | @@ -133,12 +130,13 @@ |
| 134 | 131 | if ( isset( $filters['type'] ) ) { |
| 135 | 132 | $conds['mbf_type'] = $filters['type']; |
| 136 | 133 | } |
| 137 | | - if ( isset( $filters['user'] ) ) { |
| 138 | | - if ( $filters['user']->isAnon() ) { |
| | 134 | + if ( isset( $filters['username'] ) ) { |
| | 135 | + $user = User::newFromName( $filters['username'] ); // Returns false for IPs |
| | 136 | + if ( !$user || $user->isAnon() ) { |
| 139 | 137 | $conds['mbf_user_id'] = 0; |
| 140 | | - $conds['mbf_user_ip'] = $filters['user']->getName(); |
| | 138 | + $conds['mbf_user_ip'] = $filters['username']; |
| 141 | 139 | } else { |
| 142 | | - $conds['mbf_user_id'] = $filters['user']->getID(); |
| | 140 | + $conds['mbf_user_id'] = $user->getID(); |
| 143 | 141 | $conds[] = 'mbf_user_ip IS NULL'; |
| 144 | 142 | } |
| 145 | 143 | } |