Updated Cache functions

Geeklog-Core · Jul 3, 2022 · 30778de · 30778de
1 parent 3e160fd
commit 30778de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/public_html/lib-common.php b/public_html/lib-common.php
@@ -198,7 +198,11 @@
 Log::init($_CONF['path_log']);
 
 // Load Cache class
-Cache::init(new Cache\FileSystem($_CONF['path'] . 'data/cache/'));
+if (is_callable('apcu_store')) {
+    Cache::init(new Cache\APCu());
+} else {
+    Cache::init(new Cache\FileSystem($_CONF['path'] . 'data/cache/'));
+}
 
 // Load in Geeklog Variables Table
 

diff --git a/system/classes/Cache.php b/system/classes/Cache.php
@@ -33,7 +33,6 @@ public static function init(CacheInterface $driver)
     {
         if (!self::$isInitialized) {
             self::$instance = $driver;
-//            self::$instance = new APCu();
             self::$isInitialized = true;
         }
     }
@@ -96,7 +95,7 @@ public static function get($key, $defaultValue = null)
      */
     public static function set($key, $data, $ttl = 0)
     {
-        return self::$isEnabled ? self::$instance->set($key, $data, $ttl) : false;
+        return self::$isEnabled && self::$instance->set($key, $data, $ttl);
     }
 
     /**
@@ -109,7 +108,7 @@ public static function set($key, $data, $ttl = 0)
      */
     public static function add($key, $data, $ttl = 0)
     {
-        return self::$isEnabled ? self::$instance->add($key, $data, $ttl) : false;
+        return self::$isEnabled && self::$instance->add($key, $data, $ttl);
     }
 
     /**
@@ -120,7 +119,7 @@ public static function add($key, $data, $ttl = 0)
      */
     public static function delete($key)
     {
-        return self::$isEnabled ? self::$instance->delete($key) : false;
+        return self::$isEnabled && self::$instance->delete($key);
     }
 
     /**
@@ -131,7 +130,7 @@ public static function delete($key)
      */
     public static function exists($key)
     {
-        return self::$isEnabled ? self::$instance->exists($key) : false;
+        return self::$isEnabled && self::$instance->exists($key);
     }
 
     /**