r89567 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r89566‎ | r89567 | r89568 >
Date:15:01, 6 June 2011
Author:reedy
Status:ok
Tags:
Comment:
Minor refactoring

Comment updates
Modified paths:
  • /trunk/phase3/includes/ChangeTags.php (modified) (history)
  • /trunk/phase3/includes/api/ApiFeedWatchlist.php (modified) (history)
  • /trunk/phase3/includes/api/ApiQueryImages.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialWatchlist.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialWhatlinkshere.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/ChangeTags.php
@@ -179,7 +179,11 @@
180180 return $html;
181181 }
182182
183 - /** Basically lists defined tags which count even if they aren't applied to anything */
 183+ /**
 184+ *Basically lists defined tags which count even if they aren't applied to anything
 185+ *
 186+ * @return array
 187+ */
184188 static function listDefinedTags() {
185189 // Caching...
186190 global $wgMemc;
Index: trunk/phase3/includes/api/ApiFeedWatchlist.php
@@ -117,10 +117,12 @@
118118 $feedItems[] = $this->createFeedItem( $info );
119119 }
120120
121 - $feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'watchlist' ) . ' [' . $wgLanguageCode . ']';
 121+ $msg = wfMsgForContent( 'watchlist' );
 122+
 123+ $feedTitle = $wgSitename . ' - ' . $msg . ' [' . $wgLanguageCode . ']';
122124 $feedUrl = SpecialPage::getTitleFor( 'Watchlist' )->getFullURL();
123125
124 - $feed = new $wgFeedClasses[$params['feedformat']] ( $feedTitle, htmlspecialchars( wfMsgForContent( 'watchlist' ) ), $feedUrl );
 126+ $feed = new $wgFeedClasses[$params['feedformat']] ( $feedTitle, htmlspecialchars( $msg ), $feedUrl );
125127
126128 ApiFormatFeedWrapper::setResult( $this->getResult(), $feed, $feedItems );
127129
Index: trunk/phase3/includes/api/ApiQueryImages.php
@@ -50,7 +50,6 @@
5151
5252 /**
5353 * @param $resultPageSet ApiPageSet
54 - * @return
5554 */
5655 private function run( $resultPageSet = null ) {
5756 if ( $this->getPageSet()->getGoodTitleCount() == 0 ) {
Index: trunk/phase3/includes/specials/SpecialWhatlinkshere.php
@@ -93,11 +93,11 @@
9494 }
9595
9696 /**
97 - * @param $level int Recursion level
 97+ * @param $level int Recursion level
9898 * @param $target Title Target title
99 - * @param $limit int Number of entries to display
100 - * @param $from Title Display from this article ID
101 - * @param $back Title Display from this article ID at backwards scrolling
 99+ * @param $limit int Number of entries to display
 100+ * @param $from Title Display from this article ID
 101+ * @param $back Title Display from this article ID at backwards scrolling
102102 */
103103 function showIndirectLinks( $level, $target, $limit, $from = 0, $back = 0 ) {
104104 global $wgMaxRedirectLinksRetrieved;
Index: trunk/phase3/includes/specials/SpecialWatchlist.php
@@ -49,7 +49,7 @@
5050 global $wgFeedClasses;
5151 $apiParams = array( 'action' => 'feedwatchlist', 'allrev' => 'allrev',
5252 'wlowner' => $wgUser->getName(), 'wltoken' => $wlToken );
53 - $feedTemplate = wfScript('api') . '?';
 53+ $feedTemplate = wfScript( 'api' ) . '?';
5454
5555 foreach( $wgFeedClasses as $format => $class ) {
5656 $theseParams = $apiParams + array( 'feedformat' => $format );

Status & tagging log