http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89567
Revision: 89567
Author: reedy
Date: 2011-06-06 15:01:27 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
Minor refactoring
Comment updates
Modified Paths:
--------------
trunk/phase3/includes/ChangeTags.php
trunk/phase3/includes/api/ApiFeedWatchlist.php
trunk/phase3/includes/api/ApiQueryImages.php
trunk/phase3/includes/specials/SpecialWatchlist.php
trunk/phase3/includes/specials/SpecialWhatlinkshere.php
Modified: trunk/phase3/includes/ChangeTags.php
===================================================================
--- trunk/phase3/includes/ChangeTags.php 2011-06-06 14:56:47 UTC (rev
89566)
+++ trunk/phase3/includes/ChangeTags.php 2011-06-06 15:01:27 UTC (rev
89567)
@@ -179,7 +179,11 @@
return $html;
}
- /** Basically lists defined tags which count even if they aren't
applied to anything */
+ /**
+ *Basically lists defined tags which count even if they aren't applied
to anything
+ *
+ * @return array
+ */
static function listDefinedTags() {
// Caching...
global $wgMemc;
Modified: trunk/phase3/includes/api/ApiFeedWatchlist.php
===================================================================
--- trunk/phase3/includes/api/ApiFeedWatchlist.php 2011-06-06 14:56:47 UTC
(rev 89566)
+++ trunk/phase3/includes/api/ApiFeedWatchlist.php 2011-06-06 15:01:27 UTC
(rev 89567)
@@ -117,10 +117,12 @@
$feedItems[] = $this->createFeedItem( $info );
}
- $feedTitle = $wgSitename . ' - ' . wfMsgForContent(
'watchlist' ) . ' [' . $wgLanguageCode . ']';
+ $msg = wfMsgForContent( 'watchlist' );
+
+ $feedTitle = $wgSitename . ' - ' . $msg . ' [' .
$wgLanguageCode . ']';
$feedUrl = SpecialPage::getTitleFor( 'Watchlist'
)->getFullURL();
- $feed = new $wgFeedClasses[$params['feedformat']] (
$feedTitle, htmlspecialchars( wfMsgForContent( 'watchlist' ) ), $feedUrl );
+ $feed = new $wgFeedClasses[$params['feedformat']] (
$feedTitle, htmlspecialchars( $msg ), $feedUrl );
ApiFormatFeedWrapper::setResult( $this->getResult(),
$feed, $feedItems );
Modified: trunk/phase3/includes/api/ApiQueryImages.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryImages.php 2011-06-06 14:56:47 UTC
(rev 89566)
+++ trunk/phase3/includes/api/ApiQueryImages.php 2011-06-06 15:01:27 UTC
(rev 89567)
@@ -50,7 +50,6 @@
/**
* @param $resultPageSet ApiPageSet
- * @return
*/
private function run( $resultPageSet = null ) {
if ( $this->getPageSet()->getGoodTitleCount() == 0 ) {
Modified: trunk/phase3/includes/specials/SpecialWatchlist.php
===================================================================
--- trunk/phase3/includes/specials/SpecialWatchlist.php 2011-06-06 14:56:47 UTC
(rev 89566)
+++ trunk/phase3/includes/specials/SpecialWatchlist.php 2011-06-06 15:01:27 UTC
(rev 89567)
@@ -49,7 +49,7 @@
global $wgFeedClasses;
$apiParams = array( 'action' => 'feedwatchlist', 'allrev' =>
'allrev',
'wlowner' =>
$wgUser->getName(), 'wltoken' => $wlToken );
- $feedTemplate = wfScript('api') . '?';
+ $feedTemplate = wfScript( 'api' ) . '?';
foreach( $wgFeedClasses as $format => $class ) {
$theseParams = $apiParams + array( 'feedformat' =>
$format );
Modified: trunk/phase3/includes/specials/SpecialWhatlinkshere.php
===================================================================
--- trunk/phase3/includes/specials/SpecialWhatlinkshere.php 2011-06-06
14:56:47 UTC (rev 89566)
+++ trunk/phase3/includes/specials/SpecialWhatlinkshere.php 2011-06-06
15:01:27 UTC (rev 89567)
@@ -93,11 +93,11 @@
}
/**
- * @param $level int Recursion level
+ * @param $level int Recursion level
* @param $target Title Target title
- * @param $limit int Number of entries to display
- * @param $from Title Display from this article ID
- * @param $back Title Display from this article ID at backwards
scrolling
+ * @param $limit int Number of entries to display
+ * @param $from Title Display from this article ID
+ * @param $back Title Display from this article ID at backwards
scrolling
*/
function showIndirectLinks( $level, $target, $limit, $from = 0, $back =
0 ) {
global $wgMaxRedirectLinksRetrieved;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
