| Index: trunk/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -246,7 +246,6 @@ |
| 247 | 247 | left-to-right. |
| 248 | 248 | * (bug 28719) Do not call mLinkHolders __destruct explicitly |
| 249 | 249 | * (bug 21196) Article::getContributors() no longer fails on PostgreSQL. |
| 250 | | -* (bug 28752) XCache doesn't work in CLI mode. |
| 251 | 250 | * (bug 28076) Thumbnail height limited to 360 pixels on Special:Listfiles |
| 252 | 251 | * (bug 22227) Special:Listfiles no longer throws an error on bogus file entries |
| 253 | 252 | * (bug 19408) user_properties.up_property: 32 bytes is not enough. |
| Index: trunk/phase3/includes/objectcache/XCacheBagOStuff.php |
| — | — | @@ -8,27 +8,12 @@ |
| 9 | 9 | */ |
| 10 | 10 | class XCacheBagOStuff extends BagOStuff { |
| 11 | 11 | /** |
| 12 | | - * Are we operating in CLI mode? Since xcache doesn't work then and they |
| 13 | | - * don't want to change that |
| 14 | | - * @see bug 28752 |
| 15 | | - * @var bool |
| 16 | | - */ |
| 17 | | - private $isCli = false; |
| 18 | | - |
| 19 | | - public function __construct() { |
| 20 | | - $this->isCli = php_sapi_name() == 'cli'; |
| 21 | | - } |
| 22 | | - |
| 23 | | - /** |
| 24 | 12 | * Get a value from the XCache object cache |
| 25 | 13 | * |
| 26 | 14 | * @param $key String: cache key |
| 27 | 15 | * @return mixed |
| 28 | 16 | */ |
| 29 | 17 | public function get( $key ) { |
| 30 | | - if( $this->isCli ) { |
| 31 | | - return false; |
| 32 | | - } |
| 33 | 18 | $val = xcache_get( $key ); |
| 34 | 19 | |
| 35 | 20 | if ( is_string( $val ) ) { |
| — | — | @@ -47,9 +32,7 @@ |
| 48 | 33 | * @return bool |
| 49 | 34 | */ |
| 50 | 35 | public function set( $key, $value, $expire = 0 ) { |
| 51 | | - if( !$this->isCli ) { |
| 52 | | - xcache_set( $key, serialize( $value ), $expire ); |
| 53 | | - } |
| | 36 | + xcache_set( $key, serialize( $value ), $expire ); |
| 54 | 37 | return true; |
| 55 | 38 | } |
| 56 | 39 | |
| — | — | @@ -61,9 +44,7 @@ |
| 62 | 45 | * @return bool |
| 63 | 46 | */ |
| 64 | 47 | public function delete( $key, $time = 0 ) { |
| 65 | | - if( !$this->isCli ) { |
| 66 | | - xcache_unset( $key ); |
| 67 | | - } |
| | 48 | + xcache_unset( $key ); |
| 68 | 49 | return true; |
| 69 | 50 | } |
| 70 | 51 | } |