From: Chad Horohoe <demon@users.mediawiki.org>
Date: Sun, 6 Mar 2011 19:52:23 +0000 (+0000)
Subject: (bug 26690) Value of the 'Name of wiki' field is not retain after two subsequent... 
X-Git-Tag: 1.31.0-rc.0~31598
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=755ca95e50be67742450f4dc9ba1e0a9c14a7642;p=lhc%2Fweb%2Fwiklou.git

(bug 26690) Value of the 'Name of wiki' field is not retain after two subsequent click on 'Continue' button. This has been a complaint since the beginning, that the installer "forgets" $wgSitename.

The original intention, as I saw it, was to encourage people from choosing 'MediaWiki' as the name of their wiki. Just hardcode it, I don't think we're changing the name anytime soon.
---

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 090f03c678..a04b298776 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -552,7 +552,11 @@ class WebInstaller_Name extends WebInstallerPage {
 
 		$this->startForm();
 
-		if ( $this->getVar( 'wgSitename' ) == $GLOBALS['wgSitename'] ) {
+		// Encourage people to not name their site 'MediaWiki' by blanking the
+		// field. I think that was the intent with the original $GLOBALS['wgSitename']
+		// but these two always were the same so had the effect of making the
+		// installer forget $wgSitename when navigating back to this page.
+		if ( $this->getVar( 'wgSitename' ) == 'MediaWiki' ) {
 			$this->setVar( 'wgSitename', '' );
 		}