[MediaWiki-CVS] SVN: [88346] trunk/extensions/SiteMatrix

[reedy]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88346

Revision: 88346
Author:   reedy
Date:     2011-05-17 20:27:29 +0000 (Tue, 17 May 2011)
Log Message:
-----------
Refactor out duplicate code

Modified Paths:
--------------
    trunk/extensions/SiteMatrix/SiteMatrixApi.php
    trunk/extensions/SiteMatrix/SiteMatrix_body.php

Modified: trunk/extensions/SiteMatrix/SiteMatrixApi.php
===================================================================
--- trunk/extensions/SiteMatrix/SiteMatrixApi.php       2011-05-17 20:25:48 UTC 
(rev 88345)
+++ trunk/extensions/SiteMatrix/SiteMatrixApi.php       2011-05-17 20:27:29 UTC 
(rev 88346)
@@ -24,12 +24,7 @@
                        'count' => $matrix->getCount(),
                );
 
-               if( class_exists( 'LanguageNames' ) ) {
-                       global $wgLang;
-                       $localLanguageNames = LanguageNames::getNames( 
$wgLang->getCode() );
-               } else {
-                       $localLanguageNames = array();
-               }
+               $localLanguageNames = SiteMatrixPage::getLocalLanguageNames();
 
                $params = $this->extractRequestParams();
                $type = array_flip( $params['type'] );

Modified: trunk/extensions/SiteMatrix/SiteMatrix_body.php
===================================================================
--- trunk/extensions/SiteMatrix/SiteMatrix_body.php     2011-05-17 20:25:48 UTC 
(rev 88345)
+++ trunk/extensions/SiteMatrix/SiteMatrix_body.php     2011-05-17 20:27:29 UTC 
(rev 88346)
@@ -290,8 +290,19 @@
                parent::__construct( 'SiteMatrix' );
        }
 
+       /**
+        * @return array
+        */
+       public static function getLocalLanguageNames() {
+               if( class_exists( 'LanguageNames' ) ) {
+                       global $wgLang;
+                       return LanguageNames::getNames( $wgLang->getCode() );
+               }
+               return array();
+       }
+
        function execute( $par ) {
-               global $wgOut, $wgRequest;
+               global $wgOut;
                $langNames = Language::getLanguageNames();
 
                $this->setHeaders();
@@ -299,12 +310,7 @@
 
                $matrix = new SiteMatrix();
 
-               if( class_exists( 'LanguageNames' ) ) {
-                       global $wgLang;
-                       $localLanguageNames = LanguageNames::getNames( 
$wgLang->getCode() );
-               } else {
-                       $localLanguageNames = array();
-               }
+               $localLanguageNames = self::getLocalLanguageNames();
 
                # Construct the HTML
 


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs