Fix fatal introduced in r97296. Seems to happen only after restarting memcached.
authorRoan Kattouw <catrope@users.mediawiki.org>
Tue, 8 Nov 2011 17:16:07 +0000 (17:16 +0000)
committerRoan Kattouw <catrope@users.mediawiki.org>
Tue, 8 Nov 2011 17:16:07 +0000 (17:16 +0000)
( ! ) Fatal error: Unsupported operand types in /srv/org/wikimedia/prototype/wikis/rl2/languages/Language.php on line 479
Call Stack
# Time Memory Function Location
1 0.0002 121976 {main}( ) ../index.php:0
2 0.0082 2959136 MediaWiki->run( ) ../index.php:58
3 0.0082 2959136 MediaWiki->main( ) ../Wiki.php:531
4 0.0082 2959136 MediaWiki->performRequest( ) ../Wiki.php:612
5 0.0165 5012424 MediaWiki->performAction( ) ../Wiki.php:252
6 0.0585 6947008 EditPage->submit( ) ../Wiki.php:506
7 0.0585 6947008 EditPage->edit( ) ../EditPage.php:360
8 0.1441 19979552 EditPage->showEditForm( ) ../EditPage.php:512
9 0.1704 22610032 EditPage->showStandardInputs( ) ../EditPage.php:1574
10 0.1778 22627752 Skin::makeInternalOrExternalUrl( ) ../EditPage.php:2046
11 0.1778 22627752 Skin::makeUrl( ) ../Skin.php:1006
12 0.1779 22627752 Skin::checkTitle( ) ../Skin.php:991
13 0.1780 22627752 Title::newFromText( ) ../Skin.php:1050
14 0.1780 22627752 Title->secureAndSplit( ) ../Title.php:148
15 0.1780 22627752 Language->getNsIndex( ) ../Title.php:2718
16 0.1781 22627752 Language->getNamespaceIds( ) ../Language.php:530
17 0.1782 22627752 Language->getNamespaceAliases( ) ../Language.php:505

languages/Language.php

index 4c985d9..919fb9c 100644 (file)
@@ -476,7 +476,7 @@ class Language {
                        }
 
                        global $wgExtraGenderNamespaces;
-                       $genders = $wgExtraGenderNamespaces + self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' );
+                       $genders = $wgExtraGenderNamespaces + (array)self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' );
                        foreach ( $genders as $index => $forms ) {
                                foreach ( $forms as $alias ) {
                                        $aliases[$alias] = $index;