Reverted r59548 (reopens bug 21086).

wfWikiID() is used as a way to identify and connect to a given database in LoadBalancer and various extensions, that's why it must contain the database name and table prefix. Perhaps its use as a public identifier should be optional, but in that case the public identifier needs to be customised, not the return value of wfWikiID().

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d529bde..91befc1 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -75,7 +75,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   CIDR ranges for blocking
 * $wgUseInstantCommons added for quick and easy enabling of Commons as a remote
   file repository
-* $wgWikiId added to override default output of wfWikiId()
 * $wgDBAhandler added to choose a DBA handler when using CACHE_DBA
 * $wgPreviewOnOpenNamespaces for extensions that create namespaces that behave
   similarly to the category namespace.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f583b8b..bd636d3 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -717,12 +717,6 @@ $wgDBservers               = false;
  */
 $wgLBFactoryConf    = array( 'class' => 'LBFactory_Simple' );
 
-/**
- * Unique identifier if you're paranoid and don't want $wgDBname as part of
- * wfWikiId(). See bug 21086
- */
-$wgWikiId = false;
-
 /** How long to wait for a slave to catch up to the master */
 $wgMasterWaitTimeout = 10;
 

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 306498e..363b643 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2896,9 +2896,7 @@ function wfForeignMemcKey( $db, $prefix /*, ... */ ) {
  * This is used as a prefix in memcached keys
  */
 function wfWikiID() {
-       global $wgDBprefix, $wgDBname, $wgWikiId;
-       if( $wgWikiId )
-               return $wgWikiId;
+       global $wgDBprefix, $wgDBname;
        if ( $wgDBprefix ) {
                return "$wgDBname-$wgDBprefix";
        } else {