https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113073
Revision: 113073
Author: emsmith
Date: 2012-03-05 19:48:43 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
bug 34090 - follow up to r111472 part 1 - change to use getDbKey, check for bad
titles and die with errors, and change module prefix
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
Modified: trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
2012-03-05 19:47:35 UTC (rev 113072)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
2012-03-05 19:48:43 UTC (rev 113073)
@@ -229,7 +229,7 @@
}
// get the string name of the page
- $page_name = $title_object->getText();
+ $page_name = $title_object->getDBKey();
// to build our permalink, use the feedback entry key + the
page name (isn't page name a title? but title is an object? confusing)
$permalink = SpecialPage::getTitleFor( 'ArticleFeedbackv5',
"$page_name/$itemId" );
Modified:
trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
2012-03-05 19:47:35 UTC (rev 113072)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
2012-03-05 19:48:43 UTC (rev 113073)
@@ -20,7 +20,7 @@
* Constructor
*/
public function __construct( $query, $moduleName ) {
- parent::__construct( $query, $moduleName, 'af' );
+ parent::__construct( $query, $moduleName, 'aa' );
}
/**
@@ -33,7 +33,7 @@
// If we can't hide, we can't see activity, return an empty
string
// front-end should never let you get here, but just in case
if( !$wgUser->isAllowed( 'aftv5-hide-feedback' )) {
- return;
+ $this->dieUsage( "You don't have permission to hide
feedback", 'permissiondenied' );
}
// These are our valid activity log actions
@@ -49,13 +49,16 @@
// fetch our activity database information
$feedback = $this->fetchFeedback( $feedbackId );
// if this is false, this is bad feedback - move along
- if( !$feedback) {
- return;
+ if( !$feedback ) {
+ $this->dieUsage( "Feedback does not exist",
'invalidfeedbackid' );
}
// get the string title for the page
$page = Title::newFromID( $feedback->af_page_id );
- $title = $page->getPartialURL();
+ if( !$page ) {
+ $this->dieUsage( "Page for feedback does not exist",
'invalidfeedbackid' );
+ }
+ $title = $page->getDBKey();
// get our activities
$activities = $this->fetchActivity( $title, $feedbackId,
$limit, $continue);
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-03-05 19:47:35 UTC (rev 113072)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-03-05 19:48:43 UTC (rev 113073)
@@ -648,10 +648,10 @@
'action': 'query',
'list':
'articlefeedbackv5-view-activity',
'format': 'json',
- 'affeedbackid': id,
+ 'aafeedbackid': id,
};
if( continueId > 0 ) {
- data['afcontinue'] = continueId;
+ data['aacontinue'] = continueId;
}
$.ajax( {
'url': $.articleFeedbackv5special.apiUrl,
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
