Ganeshaditya1 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59390
Change subject: Bug fix to 26720 with only the necessary diff unlike my last
upload. Has two messages added to Installer.i18n and corresponding conditions
to the submit function of webInstallerpage.php
......................................................................
Bug fix to 26720 with only the necessary diff unlike my last upload. Has
two messages added to Installer.i18n and corresponding conditions to the
submit function of webInstallerpage.php
Change-Id: I53dea7689ca141b44a64481460187d99f73499b7
---
M includes/installer/Installer.i18n.php
M includes/installer/WebInstallerPage.php
2 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/90/59390/1
diff --git a/includes/installer/Installer.i18n.php
b/includes/installer/Installer.i18n.php
index 9119312..b3b33eb 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -347,6 +347,8 @@
In '''UTF-8 mode''', MySQL will know what character set your data is in, and
can present and convert it appropriately, but it will not let you store
characters above the
[//en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual
Plane].",
'config-site-name' => 'Name of wiki:',
+ 'prohibited-name-hash' => "Site name cannot be #",
+ 'prohibited-name-MediaWiki' => "Site name cannont be MediaWiki",
'config-site-name-help' => "This will appear in the title bar
of the browser and in various other places.",
'config-site-name-blank' => 'Enter a site name.',
'config-project-namespace' => 'Project namespace:',
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index 3f3e50a..9e2188c 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -726,7 +726,13 @@
$this->parent->showError( 'config-site-name-blank' );
$retVal = false;
}
+ if(strval($this->getVar('wgSitename')) === 'MediaWiki'){
+ $this->parent->showError('prohibited-name-MediaWiki');
+ }
+ if(strval($this->getVar('wgSitename')) === '#'){
+ $this->parent->showError('prohibited-name-hash');
+ }
// Fetch namespace
$nsType = $this->getVar( '_NamespaceType' );
if ( $nsType == 'site-name' ) {
--
To view, visit https://gerrit.wikimedia.org/r/59390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53dea7689ca141b44a64481460187d99f73499b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ganeshaditya1 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
