| Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js |
| — | — | @@ -648,10 +648,10 @@ |
| 649 | 649 | 'action': 'query', |
| 650 | 650 | 'list': 'articlefeedbackv5-view-activity', |
| 651 | 651 | 'format': 'json', |
| 652 | | - 'affeedbackid': id, |
| | 652 | + 'aafeedbackid': id, |
| 653 | 653 | }; |
| 654 | 654 | if( continueId > 0 ) { |
| 655 | | - data['afcontinue'] = continueId; |
| | 655 | + data['aacontinue'] = continueId; |
| 656 | 656 | } |
| 657 | 657 | $.ajax( { |
| 658 | 658 | 'url': $.articleFeedbackv5special.apiUrl, |
| Index: trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php |
| — | — | @@ -229,7 +229,7 @@ |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | // get the string name of the page |
| 233 | | - $page_name = $title_object->getText(); |
| | 233 | + $page_name = $title_object->getDBKey(); |
| 234 | 234 | |
| 235 | 235 | // to build our permalink, use the feedback entry key + the page name (isn't page name a title? but title is an object? confusing) |
| 236 | 236 | $permalink = SpecialPage::getTitleFor( 'ArticleFeedbackv5', "$page_name/$itemId" ); |
| Index: trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | * Constructor |
| 22 | 22 | */ |
| 23 | 23 | public function __construct( $query, $moduleName ) { |
| 24 | | - parent::__construct( $query, $moduleName, 'af' ); |
| | 24 | + parent::__construct( $query, $moduleName, 'aa' ); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | /** |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | // If we can't hide, we can't see activity, return an empty string |
| 35 | 35 | // front-end should never let you get here, but just in case |
| 36 | 36 | if( !$wgUser->isAllowed( 'aftv5-hide-feedback' )) { |
| 37 | | - return; |
| | 37 | + $this->dieUsage( "You don't have permission to hide feedback", 'permissiondenied' ); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | // These are our valid activity log actions |
| — | — | @@ -49,13 +49,16 @@ |
| 50 | 50 | // fetch our activity database information |
| 51 | 51 | $feedback = $this->fetchFeedback( $feedbackId ); |
| 52 | 52 | // if this is false, this is bad feedback - move along |
| 53 | | - if( !$feedback) { |
| 54 | | - return; |
| | 53 | + if( !$feedback ) { |
| | 54 | + $this->dieUsage( "Feedback does not exist", 'invalidfeedbackid' ); |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | // get the string title for the page |
| 58 | 58 | $page = Title::newFromID( $feedback->af_page_id ); |
| 59 | | - $title = $page->getPartialURL(); |
| | 59 | + if( !$page ) { |
| | 60 | + $this->dieUsage( "Page for feedback does not exist", 'invalidfeedbackid' ); |
| | 61 | + } |
| | 62 | + $title = $page->getDBKey(); |
| 60 | 63 | |
| 61 | 64 | // get our activities |
| 62 | 65 | $activities = $this->fetchActivity( $title, $feedbackId, $limit, $continue); |