| Index: trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php |
| — | — | @@ -449,16 +449,18 @@ |
| 450 | 450 | $timestamp = $dbw->timestamp(); |
| 451 | 451 | $ip = null; |
| 452 | 452 | |
| | 453 | + if ( !$wgUser ) { |
| | 454 | + $this->dieUsage( 'User info is missing', 'missinguser' ); |
| | 455 | + } |
| | 456 | + |
| 453 | 457 | // Only save IP address if the user isn't logged in. |
| 454 | 458 | if ( !$wgUser->isLoggedIn() ) { |
| 455 | 459 | $ip = wfGetIP(); |
| 456 | 460 | } |
| 457 | 461 | |
| 458 | | - # make sure we have a page/user |
| 459 | | - if ( !$params['pageid'] || !$wgUser) { |
| 460 | | - if ( !$feedbackId ) { |
| 461 | | - $this->dieUsage( 'Page ID is missing or invalid', 'invalidpageid' ); |
| 462 | | - } |
| | 462 | + // Make sure we have a page ID |
| | 463 | + if ( !$params['pageid'] ) { |
| | 464 | + $this->dieUsage( 'Page ID is missing or invalid', 'invalidpageid' ); |
| 463 | 465 | } |
| 464 | 466 | |
| 465 | 467 | # Fetch this if it wasn't passed in |
| — | — | @@ -631,6 +633,7 @@ |
| 632 | 634 | array( 'code' => 'invalidtoken', 'info' => 'The anontoken is not 32 characters' ), |
| 633 | 635 | array( 'code' => 'invalidpage', 'info' => 'ArticleFeedback is not enabled on this page' ), |
| 634 | 636 | array( 'code' => 'invalidpageid', 'info' => 'Page ID is missing or invalid' ), |
| | 637 | + array( 'code' => 'missinguser', 'info' => 'User info is missing' ), |
| 635 | 638 | ) ); |
| 636 | 639 | } |
| 637 | 640 | |