| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -2896,9 +2896,7 @@ |
| 2897 | 2897 | * This is used as a prefix in memcached keys |
| 2898 | 2898 | */ |
| 2899 | 2899 | function wfWikiID() { |
| 2900 | | - global $wgDBprefix, $wgDBname, $wgWikiId; |
| 2901 | | - if( $wgWikiId ) |
| 2902 | | - return $wgWikiId; |
| | 2900 | + global $wgDBprefix, $wgDBname; |
| 2903 | 2901 | if ( $wgDBprefix ) { |
| 2904 | 2902 | return "$wgDBname-$wgDBprefix"; |
| 2905 | 2903 | } else { |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -717,12 +717,6 @@ |
| 718 | 718 | */ |
| 719 | 719 | $wgLBFactoryConf = array( 'class' => 'LBFactory_Simple' ); |
| 720 | 720 | |
| 721 | | -/** |
| 722 | | - * Unique identifier if you're paranoid and don't want $wgDBname as part of |
| 723 | | - * wfWikiId(). See bug 21086 |
| 724 | | - */ |
| 725 | | -$wgWikiId = false; |
| 726 | | - |
| 727 | 721 | /** How long to wait for a slave to catch up to the master */ |
| 728 | 722 | $wgMasterWaitTimeout = 10; |
| 729 | 723 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -75,7 +75,6 @@ |
| 76 | 76 | CIDR ranges for blocking |
| 77 | 77 | * $wgUseInstantCommons added for quick and easy enabling of Commons as a remote |
| 78 | 78 | file repository |
| 79 | | -* $wgWikiId added to override default output of wfWikiId() |
| 80 | 79 | * $wgDBAhandler added to choose a DBA handler when using CACHE_DBA |
| 81 | 80 | * $wgPreviewOnOpenNamespaces for extensions that create namespaces that behave |
| 82 | 81 | similarly to the category namespace. |