| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -2896,7 +2896,9 @@ |
| 2897 | 2897 | * This is used as a prefix in memcached keys |
| 2898 | 2898 | */ |
| 2899 | 2899 | function wfWikiID() { |
| 2900 | | - global $wgDBprefix, $wgDBname; |
| | 2900 | + global $wgDBprefix, $wgDBname, $wgWikiId; |
| | 2901 | + if( $wgWikiId ) |
| | 2902 | + return $wgWikiId; |
| 2901 | 2903 | if ( $wgDBprefix ) { |
| 2902 | 2904 | return "$wgDBname-$wgDBprefix"; |
| 2903 | 2905 | } else { |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -713,6 +713,12 @@ |
| 714 | 714 | */ |
| 715 | 715 | $wgLBFactoryConf = array( 'class' => 'LBFactory_Simple' ); |
| 716 | 716 | |
| | 717 | +/** |
| | 718 | + * Unique identifier if you're paranoid and don't want $wgDBname as part of |
| | 719 | + * wfWikiId(). See bug 21086 |
| | 720 | + */ |
| | 721 | +$wgWikiId = false; |
| | 722 | + |
| 717 | 723 | /** How long to wait for a slave to catch up to the master */ |
| 718 | 724 | $wgMasterWaitTimeout = 10; |
| 719 | 725 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -98,6 +98,7 @@ |
| 99 | 99 | CIDR ranges for blocking |
| 100 | 100 | * $wgUseInstantCommons added for quick and easy enabling of Commons as a remote |
| 101 | 101 | file repository |
| | 102 | +* $wgWikiId added to override default output of wfWikiId() |
| 102 | 103 | |
| 103 | 104 | === New features in 1.16 === |
| 104 | 105 | |