http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69872
Revision: 69872 Author: ashley Date: 2010-07-25 15:50:23 +0000 (Sun, 25 Jul 2010) Log Message: ----------- coding style tweaks to Interwiki.php Modified Paths: -------------- trunk/phase3/includes/Interwiki.php Modified: trunk/phase3/includes/Interwiki.php =================================================================== --- trunk/phase3/includes/Interwiki.php 2010-07-25 12:01:13 UTC (rev 69871) +++ trunk/phase3/includes/Interwiki.php 2010-07-25 15:50:23 UTC (rev 69872) @@ -7,7 +7,8 @@ /** * The interwiki class * All information is loaded on creation when called by Interwiki::fetch( $prefix ). - * All work is done on slave, because this should *never* change (except during schema updates etc, which arent wiki-related) + * All work is done on slave, because this should *never* change (except during + * schema updates etc, which aren't wiki-related) */ class Interwiki { @@ -17,11 +18,11 @@ protected $mPrefix, $mURL, $mAPI, $mWikiID, $mLocal, $mTrans; - public function __construct( $prefix = null, $url = '', $api = '', $wikiid = '', $local = 0, $trans = 0 ) { + public function __construct( $prefix = null, $url = '', $api = '', $wikiId = '', $local = 0, $trans = 0 ) { $this->mPrefix = $prefix; $this->mURL = $url; $this->mAPI = $api; - $this->mWikiID = $wikiid; + $this->mWikiID = $wikiId; $this->mLocal = $local; $this->mTrans = $trans; } @@ -63,7 +64,7 @@ } if( self::CACHE_LIMIT && count( self::$smCache ) >= self::CACHE_LIMIT ) { reset( self::$smCache ); - unset( self::$smCache[ key( self::$smCache ) ] ); + unset( self::$smCache[key( self::$smCache )] ); } self::$smCache[$prefix] = $iw; return $iw; @@ -109,7 +110,7 @@ $db = CdbReader::open( $wgInterwikiCache ); } /* Resolve site name */ - if( $wgInterwikiScopes>=3 && !$site ) { + if( $wgInterwikiScopes >= 3 && !$site ) { $site = $db->get( '__sites:' . wfWikiID() ); if ( $site == '' ) { $site = $wgInterwikiFallbackSite; @@ -125,8 +126,9 @@ if ( $value == '' && $wgInterwikiScopes >= 2 ) { $value = $db->get( "__global:{$prefix}" ); } - if ( $value == 'undef' ) + if ( $value == 'undef' ) { $value = ''; + } return $value; } @@ -155,7 +157,12 @@ __METHOD__ ) ); $iw = Interwiki::loadFromArray( $row ); if ( $iw ) { - $mc = array( 'iw_url' => $iw->mURL, 'iw_api' => $iw->mAPI, 'iw_local' => $iw->mLocal, 'iw_trans' => $iw->mTrans ); + $mc = array( + 'iw_url' => $iw->mURL, + 'iw_api' => $iw->mAPI, + 'iw_local' => $iw->mLocal, + 'iw_trans' => $iw->mTrans + ); $wgMemc->add( $key, $mc, $wgInterwikiExpiry ); return $iw; } @@ -177,7 +184,7 @@ $iw->mTrans = $mc['iw_trans']; $iw->mAPI = isset( $mc['iw_api'] ) ? $mc['iw_api'] : ''; $iw->mWikiID = isset( $mc['iw_wikiid'] ) ? $mc['iw_wikiid'] : ''; - + return $iw; } return false; @@ -185,7 +192,7 @@ /** * Get the URL for a particular title (or with $1 if no title given) - * + * * @param $title String: what text to put for the article name * @return String: the URL */ @@ -199,19 +206,19 @@ /** * Get the API URL for this wiki - * + * * @return String: the URL */ - public function getAPI( ) { + public function getAPI() { return $this->mAPI; } /** * Get the DB name for this wiki - * + * * @return String: the DB name */ - public function getWikiID( ) { + public function getWikiID() { return $this->mWikiID; } _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs