bugfix: add lost changes due merge

[friendica.git] / src / Core / Config / PConfiguration.php

diff --git a/src/Core/Config/PConfiguration.php b/src/Core/Config/PConfiguration.php
index 0d3b0c178c6cb24c02a53c8ec54454e3a096e220..e69981c08c182543079b96d93de0b30cc2a84dd5 100644 (file)
--- a/src/Core/Config/PConfiguration.php
+++ b/src/Core/Config/PConfiguration.php
@@ -6,13 +6,13 @@ namespace Friendica\Core\Config;
  * This class is responsible for the user-specific configuration values in Friendica
  * The values are set through the Config-DB-Table (per Config-DB-adapter @see Adapter\IPConfigAdapter )
  *
- * The configuration cache (@see Cache\IPConfigCache ) is used for temporary caching of database calls. This will
+ * The configuration cache (@see Cache\PConfigCache ) is used for temporary caching of database calls. This will
  * increase the performance.
  */
 class PConfiguration
 {
        /**
-        * @var Cache\IPConfigCache
+        * @var Cache\PConfigCache
         */
        private $configCache;
 
@@ -22,10 +22,10 @@ class PConfiguration
        private $configAdapter;
 
        /**
-        * @param Cache\IPConfigCache     $configCache   The configuration cache
+        * @param Cache\PConfigCache     $configCache   The configuration cache
         * @param Adapter\IPConfigAdapter $configAdapter The configuration DB-backend
         */
-       public function __construct(Cache\IPConfigCache $configCache, Adapter\IPConfigAdapter $configAdapter)
+       public function __construct(Cache\PConfigCache $configCache, Adapter\IPConfigAdapter $configAdapter)
        {
                $this->configCache = $configCache;
                $this->configAdapter = $configAdapter;
@@ -35,7 +35,7 @@ class PConfiguration
         * @brief Loads all configuration values of a user's config family into a cached storage.
         *
         * All configuration values of the given user are stored with the $uid in
-        * the cache ( @see IPConfigCache )
+        * the cache ( @see PConfigCache )
         *
         * @param string $uid The user_id
         * @param string $cat The category of the configuration value
@@ -50,7 +50,7 @@ class PConfiguration
                }
 
                // load the whole category out of the DB into the cache
-               $this->configCache->loadP($uid, $this->configAdapter->load($uid, $cat));
+               $this->configCache->load($uid, $this->configAdapter->load($uid, $cat));
        }
 
        /**
@@ -59,7 +59,7 @@ class PConfiguration
         *
         * Get a particular user's config value from the given category ($cat)
         * and the $key with the $uid from a cached storage either from the $this->configAdapter
-        * (@see IConfigAdapter ) or from the $this->configCache (@see IConfigCache ).
+        * (@see IConfigAdapter ) or from the $this->configCache (@see PConfigCache ).
         *
         * @param string  $uid           The user_id
         * @param string  $cat           The category of the configuration value
@@ -78,13 +78,13 @@ class PConfiguration
                        $dbValue = $this->configAdapter->get($uid, $cat, $key);
 
                        if (isset($dbValue)) {
-                               $this->configCache->setP($uid, $cat, $key, $dbValue);
+                               $this->configCache->set($uid, $cat, $key, $dbValue);
                                return $dbValue;
                        }
                }
 
                // use the config cache for return
-               $result = $this->configCache->getP($uid, $cat, $key);
+               $result = $this->configCache->get($uid, $cat, $key);
                return (isset($result)) ? $result : $default_value;
        }
 
@@ -106,7 +106,7 @@ class PConfiguration
        public function set($uid, $cat, $key, $value)
        {
                // set the cache first
-               $cached = $this->configCache->setP($uid, $cat, $key, $value);
+               $cached = $this->configCache->set($uid, $cat, $key, $value);
 
                // If there is no connected adapter, we're finished
                if (!$this->configAdapter->isConnected()) {
@@ -133,7 +133,7 @@ class PConfiguration
         */
        public function delete($uid, $cat, $key)
        {
-               $cacheRemoved = $this->configCache->deleteP($uid, $cat, $key);
+               $cacheRemoved = $this->configCache->delete($uid, $cat, $key);
 
                if (!$this->configAdapter->isConnected()) {
                        return $cacheRemoved;