https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114047
Revision: 114047
Author: bsitu
Date: 2012-03-17 02:23:06 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
fix for bug33214 - catch all exceptions in api execute and provides necessary
parameters required by the custom printer
Modified Paths:
--------------
trunk/phase3/includes/api/ApiFeedContributions.php
Modified: trunk/phase3/includes/api/ApiFeedContributions.php
===================================================================
--- trunk/phase3/includes/api/ApiFeedContributions.php 2012-03-17 01:36:29 UTC
(rev 114046)
+++ trunk/phase3/includes/api/ApiFeedContributions.php 2012-03-17 02:23:06 UTC
(rev 114047)
@@ -43,56 +43,80 @@
}
public function execute() {
- $params = $this->extractRequestParams();
global $wgFeed, $wgFeedClasses, $wgSitename, $wgLanguageCode;
- if( !$wgFeed ) {
- $this->dieUsage( 'Syndication feeds are not available',
'feed-unavailable' );
- }
+ try {
+ $params = $this->extractRequestParams();
+
+ if( !$wgFeed ) {
+ $this->dieUsage( 'Syndication feeds are not
available', 'feed-unavailable' );
+ }
+
+ if( !isset( $wgFeedClasses[ $params['feedformat'] ] ) )
{
+ $this->dieUsage( 'Invalid subscription feed
type', 'feed-invalid' );
+ }
- if( !isset( $wgFeedClasses[ $params['feedformat'] ] ) ) {
- $this->dieUsage( 'Invalid subscription feed type',
'feed-invalid' );
- }
+ global $wgMiserMode;
+ if ( $params['showsizediff'] && $wgMiserMode ) {
+ $this->dieUsage( 'Size difference is disabled
in Miser Mode', 'sizediffdisabled' );
+ }
+
+ $msg = wfMsgForContent( 'Contributions' );
+ $feedTitle = $wgSitename . ' - ' . $msg . ' [' .
$wgLanguageCode . ']';
+ $feedUrl = SpecialPage::getTitleFor( 'Contributions',
$params['user'] )->getFullURL();
+
+ $target = $params['user'] == 'newbies'
+ ? 'newbies'
+ : Title::makeTitleSafe( NS_USER,
$params['user'] )->getText();
+
+ $feed = new $wgFeedClasses[$params['feedformat']] (
+ $feedTitle,
+ htmlspecialchars( $msg ),
+ $feedUrl
+ );
+
+ $pager = new ContribsPager( $this->getContext(), array(
+ 'target' => $target,
+ 'namespace' => $params['namespace'],
+ 'year' => $params['year'],
+ 'month' => $params['month'],
+ 'tagFilter' => $params['tagfilter'],
+ 'deletedOnly' => $params['deletedonly'],
+ 'topOnly' => $params['toponly'],
+ 'showSizeDiff' => $params['showsizediff'],
+ ) );
+
+ $feedItems = array();
+ if( $pager->getNumRows() > 0 ) {
+ foreach ( $pager->mResult as $row ) {
+ $feedItems[] = $this->feedItem( $row );
+ }
+ }
+
+ ApiFormatFeedWrapper::setResult( $this->getResult(),
$feed, $feedItems );
+
+ } catch ( Exception $e ) {
+ // Error results should not be cached
+ $this->getMain()->setCacheMaxAge( 0 );
- global $wgMiserMode;
- if ( $params['showsizediff'] && $wgMiserMode ) {
- $this->dieUsage( 'Size difference is disabled in Miser
Mode', 'sizediffdisabled' );
- }
+ $feedTitle = $wgSitename . ' - Error - ' .
wfMsgForContent( 'contributions' ) . ' [' . $wgLanguageCode . ']';
+ $feedUrl = SpecialPage::getTitleFor( 'Contributions',
$params['user'] )->getFullURL();
- $msg = wfMsgForContent( 'Contributions' );
- $feedTitle = $wgSitename . ' - ' . $msg . ' [' .
$wgLanguageCode . ']';
- $feedUrl = SpecialPage::getTitleFor( 'Contributions',
$params['user'] )->getFullURL();
+ $feedFormat = isset( $params['feedformat'] ) ?
$params['feedformat'] : 'rss';
+ $feed = new $wgFeedClasses[$feedFormat] ( $feedTitle,
htmlspecialchars( wfMsgForContent( 'contributions' ) ), $feedUrl );
- $target = $params['user'] == 'newbies'
- ? 'newbies'
- : Title::makeTitleSafe( NS_USER,
$params['user'] )->getText();
+ if ( $e instanceof UsageException ) {
+ $errorCode = $e->getCodeString();
+ } else {
+ // Something is seriously wrong
+ $errorCode = 'internal_api_error';
+ }
- $feed = new $wgFeedClasses[$params['feedformat']] (
- $feedTitle,
- htmlspecialchars( $msg ),
- $feedUrl
- );
-
- $pager = new ContribsPager( $this->getContext(), array(
- 'target' => $target,
- 'namespace' => $params['namespace'],
- 'year' => $params['year'],
- 'month' => $params['month'],
- 'tagFilter' => $params['tagfilter'],
- 'deletedOnly' => $params['deletedonly'],
- 'topOnly' => $params['toponly'],
- 'showSizeDiff' => $params['showsizediff'],
- ) );
-
- $feedItems = array();
- if( $pager->getNumRows() > 0 ) {
- foreach ( $pager->mResult as $row ) {
- $feedItems[] = $this->feedItem( $row );
- }
+ $errorText = $e->getMessage();
+ $feedItems[] = new FeedItem( "Error ($errorCode)",
$errorText, '', '', '' );
+ ApiFormatFeedWrapper::setResult( $this->getResult(),
$feed, $feedItems );
}
-
- ApiFormatFeedWrapper::setResult( $this->getResult(), $feed,
$feedItems );
}
protected function feedItem( $row ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
