Improve sanity check on site name a bit: ban '#' (number sign). There are undoubtedl...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c4c0cd3..af03bfa 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -314,6 +314,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12567) Fix for misformatted read-only messages on edit, protect.
   Also added proper read-only checks to several special pages.
   Have removed read-only checks from the general user permission framework.
+* Creating a site with a name containing '#' is no longer permitted, since the
+  name will not work (but $wgSiteName is not checked if manually set).
 
 
 == Parser changes in 1.12 ==

diff --git a/config/index.php b/config/index.php
index 3e591b4..c4cf210 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -599,8 +599,8 @@ print "<li style='font-weight:bold;color:green;font-size:110%'>Environment check
 /* Check for validity */
 $errs = array();
 
-if( $conf->Sitename == "" || $conf->Sitename == "MediaWiki" || $conf->Sitename == "Mediawiki" ) {
-       $errs["Sitename"] = "Must not be blank or \"MediaWiki\"";
+if( preg_match( '/^$|^mediawiki$|#/i', $conf->Sitename ) ) {
+       $errs["Sitename"] = "Must not be blank or \"MediaWiki\" and may not contain \"#\"";
 }
 if( $conf->DBuser == "" ) {
        $errs["DBuser"] = "Must not be blank";