Fix for r85114, see code reviev

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2a959fb..e564eb4 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1534,9 +1534,9 @@ $wgObjectCaches = array(
        CACHE_DB => array( 'class' => 'SqlBagOStuff', 'table' => 'objectcache' ),
        CACHE_DBA => array( 'class' => 'DBABagOStuff' ),
 
-       CACHE_ANYTHING => array( 'factory' => array( 'ObjectCache', 'newAnything' ) ),
-       CACHE_ACCEL => array( 'factory' => array( 'ObjectCache', 'newAccelerator' ) ),
-       CACHE_MEMCACHED => array( 'factory' => array( 'ObjectCache', 'newMemcached' ) ),
+       CACHE_ANYTHING => array( 'factory' => 'ObjectCache::newAnything' ),
+       CACHE_ACCEL => array( 'factory' => 'ObjectCache::newAccelerator' ),
+       CACHE_MEMCACHED => array( 'factory' => 'ObjectCache::newMemcached' ),
 
        'eaccelerator' => array( 'class' => 'eAccelBagOStuff' ),
        'apc' => array( 'class' => 'APCBagOStuff' ),
@@ -5320,7 +5320,9 @@ $wgDisabledActions = array();
 
 /**
  * Disable redirects to special pages and interwiki redirects, which use a 302
- * and have no "redirected from" link.
+ * and have no "redirected from" link. Note this is only for articles with #Redirect
+ * in them. URL's containing a local interwiki prefix (or a non-canonical special
+ * page name) are still hard redirected regardless of this setting.
  */
 $wgDisableHardRedirects = false;