I've gone and done something naughty. I've just bumped $wgVersion

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

diff --git a/maintenance/addwiki.php b/maintenance/addwiki.php
index ad462d3..5d71575 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,12 +22,12 @@
  * 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
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class AddWiki extends Maintenance {
        public function __construct() {
@@ -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);
+               $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";
@@ -73,6 +78,10 @@ class AddWiki extends Maintenance {
                $dbw->sourceFile( "$IP/extensions/AbuseFilter/abusefilter.tables.sql" );
                $dbw->sourceFile( "$IP/extensions/UsabilityInitiative/PrefStats/PrefStats.sql" );
                $dbw->sourceFile( "$IP/extensions/ProofreadPage/ProofreadPage.sql" );
+               $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)" );
 
@@ -111,7 +120,7 @@ class AddWiki extends Maintenance {
                                $blobsFile = popen( $sedCmd, 'r' );
                                $extdb->sourceStream( $blobsFile );
                                pclose( $blobsFile );
-                               $extdb->immediateCommit();
+                               $extdb->commit();
                        }
                }
 
@@ -131,11 +140,11 @@ class AddWiki extends Maintenance {
                fclose( $file );
 
                # Update the sublists
-               shell_exec("cd $common && ./refresh-dblist");
+               shell_exec( "cd $common && ./refresh-dblist" );
 
-               #print "Constructing interwiki SQL\n";
+               # print "Constructing interwiki SQL\n";
                # Rebuild interwiki tables
-               #passthru( '/home/wikipedia/conf/interwiki/update' );
+               # passthru( '/home/wikipedia/conf/interwiki/update' );
 
                $this->output( "Script ended. You still have to:
        * Add any required settings in InitialiseSettings.php
@@ -219,7 +228,6 @@ See Wikimedia's [[m:|Meta-Wiki]] for the coordination of these projects.
 [[cu:]]
 [[cv:]]
 [[cy:]]
-[[cz:]]
 [[da:]]
 [[de:]]
 [[diq:]]