http://www.mediawiki.org/wiki/Special:Code/MediaWiki/60960
Revision: 60960
Author: tstarling
Date: 2010-01-12 05:20:31 +0000 (Tue, 12 Jan 2010)
Log Message:
-----------
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().
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/includes/GlobalFunctions.php
Modified: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES 2010-01-12 05:04:20 UTC (rev 60959)
+++ trunk/phase3/RELEASE-NOTES 2010-01-12 05:20:31 UTC (rev 60960)
@@ -75,7 +75,6 @@
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.
Modified: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php 2010-01-12 05:04:20 UTC (rev
60959)
+++ trunk/phase3/includes/DefaultSettings.php 2010-01-12 05:20:31 UTC (rev
60960)
@@ -717,12 +717,6 @@
*/
$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;
Modified: trunk/phase3/includes/GlobalFunctions.php
===================================================================
--- trunk/phase3/includes/GlobalFunctions.php 2010-01-12 05:04:20 UTC (rev
60959)
+++ trunk/phase3/includes/GlobalFunctions.php 2010-01-12 05:20:31 UTC (rev
60960)
@@ -2896,9 +2896,7 @@
* 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 {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
