(bug 23375) Added ogv, oga, spx as extensions for ogg files. Patch by Derk-Jan Hartman.

[lhc/web/wiklou.git] / maintenance / addwiki.php

diff --git a/maintenance/addwiki.php b/maintenance/addwiki.php
index 15354f1..35861fa 100644 (file)
--- a/maintenance/addwiki.php
+++ b/maintenance/addwiki.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @defgroup Wikimedia Wikimedia
+ */
+
 /**
  * Add a new wiki
  * Wikimedia specific!
@@ -18,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @defgroup Wikimedia Wikimedia
+ * @file
  * @ingroup Maintenance
  * @ingroup Wikimedia
  */
@@ -34,22 +38,23 @@ class AddWiki extends Maintenance {
                $this->addArg( 'dbname', 'Name of database to create' );
        }
 
-       protected function getDbType() {
+       public function getDbType() {
                return Maintenance::DB_ADMIN;
        }
 
        public function execute() {
-               global $IP, $wgLanguageNames, $wgDefaultExternalStore, $wgNoDBParam;
+               global $IP, $wgDefaultExternalStore, $wgNoDBParam;
 
                $wgNoDBParam = true;
                $lang = $this->getArg(0);
                $site = $this->getArg(1);
                $dbName = $this->getArg(2);
+               $languageNames = Language::getLanguageNames();
 
-               if ( !isset( $wgLanguageNames[$lang] ) ) {
+               if ( !isset( $languageNames[$lang] ) ) {
                        $this->error( "Language $lang not found in \$wgLanguageNames", true );
                }
-               $name = $wgLanguageNames[$lang];
+               $name = $languageNames[$lang];
 
                $dbw = wfGetDB( DB_MASTER );
                $common = "/home/wikipedia/common";
@@ -76,6 +81,7 @@ class AddWiki extends Maintenance {
                $dbw->sourceFile( "$IP/extensions/UsabilityInitiative/ClickTracking/ClickTrackingEvents.sql" );
                $dbw->sourceFile( "$IP/extensions/UsabilityInitiative/ClickTracking/ClickTracking.sql" );
                $dbw->sourceFile( "$IP/extensions/UsabilityInitiative/UserDailyContribs/UserDailyContribs.sql" );
+               $dbw->sourceFile( "$IP/extensions/UsabilityInitiative/Optin/OptIn.sql" );
 
                $dbw->query( "INSERT INTO site_stats(ss_row_id) VALUES (1)" );
 
@@ -114,7 +120,7 @@ class AddWiki extends Maintenance {
                                $blobsFile = popen( $sedCmd, 'r' );
                                $extdb->sourceStream( $blobsFile );
                                pclose( $blobsFile );
-                               $extdb->immediateCommit();
+                               $extdb->commit();
                        }
                }