| Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -421,6 +421,7 @@ |
| 422 | 422 | * (bug 29959) Installer fatal when cURL and allow_url_fopen is disabled and user |
| 423 | 423 | tries to subsribe to mediawiki-announce |
| 424 | 424 | * Installer checked for magic_quotes_runtime instead of register_globals. |
| | 425 | +* (bug 30131) XCache with variable caching disabled no longer used for variable caching (CACHE_ACCEL) |
| 425 | 426 | |
| 426 | 427 | === API changes in 1.18 === |
| 427 | 428 | * BREAKING CHANGE: action=watch now requires POST and token. |
| Index: branches/REL1_18/phase3/includes/objectcache/ObjectCache.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | $id = 'eaccelerator'; |
| 95 | 95 | } elseif ( function_exists( 'apc_fetch') ) { |
| 96 | 96 | $id = 'apc'; |
| 97 | | - } elseif( function_exists( 'xcache_get' ) ) { |
| | 97 | + } elseif( function_exists( 'xcache_get' ) && wfIniGetBool( 'xcache.var_size' ) ) { |
| 98 | 98 | $id = 'xcache'; |
| 99 | 99 | } elseif( function_exists( 'wincache_ucache_get' ) ) { |
| 100 | 100 | $id = 'wincache'; |
| Index: branches/REL1_18/phase3/includes/installer/Installer.php |
| — | — | @@ -791,6 +791,9 @@ |
| 792 | 792 | $caches = array(); |
| 793 | 793 | foreach ( $this->objectCaches as $name => $function ) { |
| 794 | 794 | if ( function_exists( $function ) ) { |
| | 795 | + if ( $name == 'xcache' && !wfIniGetBool( 'xcache.var_size' ) ) { |
| | 796 | + continue; |
| | 797 | + } |
| 795 | 798 | $caches[$name] = true; |
| 796 | 799 | } |
| 797 | 800 | } |