Merge "rdbms: fix Sqlite::tableExists() method to avoid STATUS_TRX_ERROR"

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

diff --git a/includes/libs/objectcache/CachedBagOStuff.php b/includes/libs/objectcache/CachedBagOStuff.php
index c85a82e..dbab593 100644 (file)
--- a/includes/libs/objectcache/CachedBagOStuff.php
+++ b/includes/libs/objectcache/CachedBagOStuff.php
@@ -86,12 +86,12 @@ class CachedBagOStuff extends HashBagOStuff {
                return $this->backend->deleteObjectsExpiringBefore( $date, $progressCallback );
        }
 
-       public function makeKey() {
-               return call_user_func_array( [ $this->backend, __FUNCTION__ ], func_get_args() );
+       public function makeKey( $class, $component = null ) {
+               return $this->backend->makeKey( ...func_get_args() );
        }
 
-       public function makeGlobalKey() {
-               return call_user_func_array( [ $this->backend, __FUNCTION__ ], func_get_args() );
+       public function makeGlobalKey( $class, $component = null ) {
+               return $this->backend->makeGlobalKey( ...func_get_args() );
        }
 
        // These just call the backend (tested elsewhere)