r83812, r83814: Don't use cl_type at all when paging categorylinks

[lhc/web/wiklou.git] / includes / Interwiki.php

diff --git a/includes/Interwiki.php b/includes/Interwiki.php
index 45c9dbb..84f2686 100644 (file)
--- a/includes/Interwiki.php
+++ b/includes/Interwiki.php
@@ -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 @@ class Interwiki {
 
        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 @@ class Interwiki {
                }
                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 @@ class Interwiki {
                        $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 @@ class Interwiki {
                if ( $value == '' && $wgInterwikiScopes >= 2 ) {
                        $value = $db->get( "__global:{$prefix}" );
                }
-               if ( $value == 'undef' )
+               if ( $value == 'undef' ) {
                        $value = '';
+               }
 
                return $value;
        }
@@ -141,7 +143,7 @@ class Interwiki {
                global $wgMemc, $wgInterwikiExpiry;
                $key = wfMemcKey( 'interwiki', $prefix );
                $mc = $wgMemc->get( $key );
-               $iw = false;
+
                if( $mc && is_array( $mc ) ) { // is_array is hack for old keys
                        $iw = Interwiki::loadFromArray( $mc );
                        if( $iw ) {
@@ -155,7 +157,12 @@ class Interwiki {
                        __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;
                }
@@ -170,14 +177,14 @@ class Interwiki {
         * @return Boolean: whether everything was there
         */
        protected static function loadFromArray( $mc ) {
-               if( isset( $mc['iw_url'] ) && isset( $mc['iw_api'] ) && isset( $mc['iw_wikiid'] )
-                                && isset( $mc['iw_local'] ) && isset( $mc['iw_trans'] ) ) {
+               if( isset( $mc['iw_url'] ) && isset( $mc['iw_local'] ) && isset( $mc['iw_trans'] ) ) {
                        $iw = new Interwiki();
                        $iw->mURL = $mc['iw_url'];
-                       $iw->mAPI = $mc['iw_api'];
-                       $iw->mWikiID = $mc['iw_wikiid'];
                        $iw->mLocal = $mc['iw_local'];
                        $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 @@ class Interwiki {
 
        /**
         * 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 @@ class Interwiki {
 
        /**
         * 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;
        }
 
@@ -241,9 +248,8 @@ class Interwiki {
         * @return String
         */
        public function getName() {
-               $key = 'interwiki-name-' . $this->mPrefix;
-               $msg = wfMsgForContent( $key );
-               return wfEmptyMsg( $key, $msg ) ? '' : $msg;
+               $msg = wfMessage( 'interwiki-name-' . $this->mPrefix )->inContentLanguage();
+               return !$msg->exists() ? '' : $msg;
        }
 
        /**
@@ -252,8 +258,7 @@ class Interwiki {
         * @return String
         */
        public function getDescription() {
-               $key = 'interwiki-desc-' . $this->mPrefix;
-               $msg = wfMsgForContent( $key );
-               return wfEmptyMsg( $key, $msg ) ? '' : $msg;
+               $msg = wfMessage( 'interwiki-desc-' . $this->mPrefix )->inContentLanguage();
+               return !$msg->exists() ? '' : $msg;
        }
 }