objectcache: merge getWithToken() into doGet() for simplicity

[lhc/web/wiklou.git] / includes / libs / objectcache / APCUBagOStuff.php

diff --git a/includes/libs/objectcache/APCUBagOStuff.php b/includes/libs/objectcache/APCUBagOStuff.php
index c36a1dc..da6544b 100644 (file)
--- a/includes/libs/objectcache/APCUBagOStuff.php
+++ b/includes/libs/objectcache/APCUBagOStuff.php
@@ -39,11 +39,7 @@ class APCUBagOStuff extends APCBagOStuff {
                parent::__construct( $params );
        }
 
-       protected function doGet( $key, $flags = 0 ) {
-               return $this->unserialize( apcu_fetch( $key . self::KEY_SUFFIX ) );
-       }
-
-       protected function getWithToken( $key, &$casToken, $flags = 0 ) {
+       protected function doGet( $key, $flags = 0, &$casToken = null ) {
                $casToken = null;
 
                $blob = apcu_fetch( $key . self::KEY_SUFFIX );