| Index: trunk/phase3/includes/LocalisationCache.php |
| — | — | @@ -159,13 +159,8 @@ |
| 160 | 160 | case 'db': |
| 161 | 161 | $storeClass = 'LCStore_DB'; |
| 162 | 162 | break; |
| 163 | | - case 'accel': |
| 164 | 163 | case 'detect': |
| 165 | | - if ( !( wfGetCache( CACHE_ACCEL ) instanceof FakeMemCachedClient ) ) { |
| 166 | | - $storeClass = 'LCStore_Accel'; |
| 167 | | - } else { |
| 168 | | - $storeClass = $wgCacheDirectory ? 'LCStore_CDB' : 'LCStore_DB'; |
| 169 | | - } |
| | 164 | + $storeClass = $wgCacheDirectory ? 'LCStore_CDB' : 'LCStore_DB'; |
| 170 | 165 | break; |
| 171 | 166 | default: |
| 172 | 167 | throw new MWException( |
| — | — | @@ -353,9 +348,7 @@ |
| 354 | 349 | } |
| 355 | 350 | |
| 356 | 351 | $deps = $this->store->get( $code, 'deps' ); |
| 357 | | - $keys = $this->store->get( $code, 'list', 'messages' ); |
| 358 | | - // 'list:messages' sometimes expires separately of 'deps' in LCStore_Accel |
| 359 | | - if ( $deps === null || $keys === null ) { |
| | 352 | + if ( $deps === null ) { |
| 360 | 353 | wfDebug( __METHOD__."($code): cache missing, need to make one\n" ); |
| 361 | 354 | return true; |
| 362 | 355 | } |
| — | — | @@ -837,56 +830,6 @@ |
| 838 | 831 | } |
| 839 | 832 | |
| 840 | 833 | /** |
| 841 | | - * LCStore implementation which uses PHP accelerator to store data. |
| 842 | | - * This will work if one of XCache, eAccelerator, or APC cacher is configured. |
| 843 | | - * (See ObjectCache.php) |
| 844 | | - */ |
| 845 | | -class LCStore_Accel implements LCStore { |
| 846 | | - var $currentLang; |
| 847 | | - var $keys; |
| 848 | | - |
| 849 | | - public function __construct() { |
| 850 | | - $this->cache = wfGetCache( CACHE_ACCEL ); |
| 851 | | - } |
| 852 | | - |
| 853 | | - public function get( $code, $key ) { |
| 854 | | - $k = wfMemcKey( 'l10n', $code, 'k', $key ); |
| 855 | | - $r = $this->cache->get( $k ); |
| 856 | | - if ( $r === false ) return null; |
| 857 | | - return $r; |
| 858 | | - } |
| 859 | | - |
| 860 | | - public function startWrite( $code ) { |
| 861 | | - $k = wfMemcKey( 'l10n', $code, 'l' ); |
| 862 | | - $keys = $this->cache->get( $k ); |
| 863 | | - if ( $keys ) { |
| 864 | | - foreach ( $keys as $k ) { |
| 865 | | - $this->cache->delete( $k ); |
| 866 | | - } |
| 867 | | - } |
| 868 | | - $this->currentLang = $code; |
| 869 | | - $this->keys = array(); |
| 870 | | - } |
| 871 | | - |
| 872 | | - public function finishWrite() { |
| 873 | | - if ( $this->currentLang ) { |
| 874 | | - $k = wfMemcKey( 'l10n', $this->currentLang, 'l' ); |
| 875 | | - $this->cache->set( $k, array_keys( $this->keys ) ); |
| 876 | | - } |
| 877 | | - $this->currentLang = null; |
| 878 | | - $this->keys = array(); |
| 879 | | - } |
| 880 | | - |
| 881 | | - public function set( $key, $value ) { |
| 882 | | - if ( $this->currentLang ) { |
| 883 | | - $k = wfMemcKey( 'l10n', $this->currentLang, 'k', $key ); |
| 884 | | - $this->keys[$k] = true; |
| 885 | | - $this->cache->set( $k, $value ); |
| 886 | | - } |
| 887 | | - } |
| 888 | | -} |
| 889 | | - |
| 890 | | -/** |
| 891 | 834 | * LCStore implementation which uses the standard DB functions to store data. |
| 892 | 835 | * This will work on any MediaWiki installation. |
| 893 | 836 | */ |
| — | — | @@ -1183,4 +1126,4 @@ |
| 1184 | 1127 | $this->unload( $code ); |
| 1185 | 1128 | } |
| 1186 | 1129 | } |
| 1187 | | -} |
| \ No newline at end of file |
| | 1130 | +} |
| Index: trunk/phase3/includes/AutoLoader.php |
| — | — | @@ -127,7 +127,6 @@ |
| 128 | 128 | 'IndexPager' => 'includes/Pager.php', |
| 129 | 129 | 'Interwiki' => 'includes/interwiki/Interwiki.php', |
| 130 | 130 | 'IP' => 'includes/IP.php', |
| 131 | | - 'LCStore_Accel' => 'includes/LocalisationCache.php', |
| 132 | 131 | 'LCStore_CDB' => 'includes/LocalisationCache.php', |
| 133 | 132 | 'LCStore_DB' => 'includes/LocalisationCache.php', |
| 134 | 133 | 'LCStore_Null' => 'includes/LocalisationCache.php', |