coding style tweaks, doc updates, marked some public functions as such

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

diff --git a/includes/Interwiki.php b/includes/Interwiki.php
index 5a3b655..036cbe3 100644 (file)
--- a/includes/Interwiki.php
+++ b/includes/Interwiki.php
@@ -141,11 +141,19 @@ class Interwiki {
         */
        protected static function load( $prefix ) {
                global $wgMemc, $wgInterwikiExpiry;
-               $key = wfMemcKey( 'interwiki', $prefix );
-               $mc = $wgMemc->get( $key );
 
-               if( $mc && is_array( $mc ) ) { // is_array is hack for old keys
-                       $iw = Interwiki::loadFromArray( $mc );
+               $iwData = false;
+               if ( !wfRunHooks( 'InterwikiLoadPrefix', array( $prefix, &$iwData ) ) ) {
+                       return Interwiki::loadFromArray( $iwData );
+               }
+
+               if ( !$iwData ) {
+                       $key = wfMemcKey( 'interwiki', $prefix );
+                       $iwData = $wgMemc->get( $key );
+               }
+
+               if( $iwData && is_array( $iwData ) ) { // is_array is hack for old keys
+                       $iw = Interwiki::loadFromArray( $iwData );
                        if( $iw ) {
                                return $iw;
                        }
@@ -248,9 +256,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;
        }
 
        /**
@@ -259,8 +266,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;
        }
 }