Merge "(bug 42269) namespaceDupes.php has to use the interwiki cache"
authorBrian Wolff <bawolff+wn@gmail.com>
Mon, 24 Dec 2012 05:47:52 +0000 (05:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 24 Dec 2012 05:47:52 +0000 (05:47 +0000)
maintenance/namespaceDupes.php

index 4197a35..6067a82 100644 (file)
@@ -147,14 +147,13 @@ class NamespaceConflictChecker extends Maintenance {
        /**
         * Get the interwiki list
         *
-        * @todo Needs to respect interwiki cache!
         * @return Array
         */
        private function getInterwikiList() {
-               $result = $this->db->select( 'interwiki', array( 'iw_prefix' ) );
+               $result = Interwiki::getAllPrefixes();
                $prefixes = array();
                foreach ( $result as $row ) {
-                       $prefixes[] = $row->iw_prefix;
+                       $prefixes[] = $row['iw_prefix'];
                }
                return $prefixes;
        }