Index: branches/wmf/1.16wmf4/maintenance/addwiki.php |
— | — | @@ -43,17 +43,18 @@ |
44 | 44 | } |
45 | 45 | |
46 | 46 | public function execute() { |
47 | | - global $IP, $wgLanguageNames, $wgDefaultExternalStore, $wgNoDBParam; |
| 47 | + global $IP, $wgDefaultExternalStore, $wgNoDBParam; |
48 | 48 | |
49 | 49 | $wgNoDBParam = true; |
50 | 50 | $lang = $this->getArg(0); |
51 | 51 | $site = $this->getArg(1); |
52 | 52 | $dbName = $this->getArg(2); |
| 53 | + $languageNames = Language::getLanguageNames(); |
53 | 54 | |
54 | | - if ( !isset( $wgLanguageNames[$lang] ) ) { |
| 55 | + if ( !isset( $languageNames[$lang] ) ) { |
55 | 56 | $this->error( "Language $lang not found in \$wgLanguageNames", true ); |
56 | 57 | } |
57 | | - $name = $wgLanguageNames[$lang]; |
| 58 | + $name = $languageNames[$lang]; |
58 | 59 | |
59 | 60 | $dbw = wfGetDB( DB_MASTER ); |
60 | 61 | $common = "/home/wikipedia/common"; |
Property changes on: branches/wmf/1.16wmf4/maintenance |
___________________________________________________________________ |
Name: svn:mergeinfo |
61 | 62 | + /branches/wmf-deployment/maintenance:60970 |
/trunk/phase3/maintenance:63545-63546,63549,63643,63764,63897-63901,63935,64113,64509,65387,65391,65555,65590,65650,65816 |