* (bug 10495) $wgMemcachedDebug set twice in includes/DefaultSettings.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5142241..aaa25fc 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -265,6 +265,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 10496) Fix broken DISTINCT option logic in database backend
 * Fix CSS media declaration for "screen, projection"; was causing some
   validation issues
+* (bug 10495) $wgMemcachedDebug set twice in includes/DefaultSettings.php
 
 == API changes since 1.10 ==
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 416f9e7..2a70250 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -671,7 +671,6 @@ $wgLinkCacheMemcached = false; # Not fully tested
 $wgUseMemCached     = false;
 $wgMemCachedDebug   = false; # Will be set to false in Setup.php, if the server isn't working
 $wgMemCachedServers = array( '127.0.0.1:11000' );
-$wgMemCachedDebug   = false;
 $wgMemCachedPersistent = false;
 
 /**