jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/389554 )

Change subject: $site is vague, rename to $siteGroup
......................................................................


$site is vague, rename to $siteGroup

Change-Id: I6764737de117f35b07eaa9caa8d796f235e35f69
---
M addWiki.php
1 file changed, 9 insertions(+), 9 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/addWiki.php b/addWiki.php
index 391a919..3b6d80a 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -62,7 +62,7 @@
                }
 
                $lang = $this->getArg( 0 );
-               $site = $this->getArg( 1 );
+               $siteGroup = $this->getArg( 1 );
                $dbName = $this->getArg( 2 );
                $domain = $this->getArg( 3 );
                $languageNames = Language::fetchLanguageNames();
@@ -74,7 +74,7 @@
 
                $dbw = wfGetDB( DB_MASTER );
 
-               $this->output( "Creating database $dbName for $lang.$site 
($name)\n" );
+               $this->output( "Creating database $dbName for $lang.$siteGroup 
($name)\n" );
 
                // Set up the database
                $dbw->query( "SET storage_engine=InnoDB" );
@@ -108,7 +108,7 @@
                $dbw->sourceFile( 
"$IP/extensions/Wikidata/extensions/Wikibase/client/sql/entity_usage.sql" );
 
                // Add project specific extension table additions here
-               switch ( $site ) {
+               switch ( $siteGroup ) {
                        case 'wikipedia':
                                break;
                        case 'wiktionary':
@@ -206,10 +206,10 @@
                $title = Title::newFromText( wfMessage( 'mainpage' 
)->inLanguage( $lang )->useDatabase( false )->plain() );
                $this->output( "Writing main page to " . 
$title->getPrefixedDBkey() . "\n" );
                $article = WikiPage::factory( $title );
-               $ucsite = ucfirst( $site );
+               $ucSiteGroup = ucfirst( $siteGroup );
 
                $article->doEditContent(
-                       ContentHandler::makeContent( $this->getFirstArticle( 
$ucsite, $name ), $title ),
+                       ContentHandler::makeContent( $this->getFirstArticle( 
$ucSiteGroup, $name ), $title ),
                        '',
                        EDIT_NEW | EDIT_AUTOSUMMARY
                );
@@ -237,17 +237,17 @@
                        
"$IP/extensions/Wikidata/extensions/Wikibase/lib/maintenance/populateSitesTable.php"
                );
 
-               $sitesPopulation->mOptions[ 'site-group' ] = $site;
+               $sitesPopulation->mOptions[ 'site-group' ] = $siteGroup;
                $sitesPopulation->mOptions[ 'force-protocol' ] = 'https';
                $sitesPopulation->execute();
 
                // Repopulate Cognate sites table
-               if ( $site === 'wiktionary' ) {
+               if ( $siteGroup === 'wiktionary' ) {
                        $cognateSitesPopulation = $this->runChild(
                                'Cognate\PopulateCognateSites',
                                
"$IP/extensions/Cognate/maintenance/populateCognateSites.php"
                        );
-                       $cognateSitesPopulation->mOptions[ 'site-group' ] = 
$site;
+                       $cognateSitesPopulation->mOptions[ 'site-group' ] = 
$siteGroup;
                        $cognateSitesPopulation->execute();
                }
 
@@ -274,7 +274,7 @@
                $time = wfTimestamp( TS_RFC2822 );
                UserMailer::send( new MailAddress( $wmgAddWikiNotify ),
                        new MailAddress( $wgPasswordSender ), "New wiki: 
$dbName",
-                       "A new wiki was created by $user at $time for a $ucsite 
in $name ($lang).\nOnce the wiki is fully set up, it'll be visible at 
https://$domain";
+                       "A new wiki was created by $user at $time for a 
$ucSiteGroup in $name ($lang).\nOnce the wiki is fully set up, it'll be visible 
at https://$domain";
                );
 
                $this->output( "Done. sync the config as in 
https://wikitech.wikimedia.org/wiki/Add_a_wiki#MediaWiki_configuration\n"; );

-- 
To view, visit https://gerrit.wikimedia.org/r/389554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6764737de117f35b07eaa9caa8d796f235e35f69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to