Merge pull request #4613 from MrPetovan/task/4518-add-cache-delete

Add missing Cache::delete method

diff --git a/mod/acl.php b/mod/acl.php
index 11d9e5683a76a9014802c527e3d0cba8d49fa9ad..817a026553b42ad78788be0c600cb07fbf9d7cb5 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -32,7 +32,7 @@ function acl_content(App $a)
                $search = $_REQUEST['query'];
        }
 
-       logger('Searching for ' . $search . ' - type ' . $type, LOGGER_DEBUG);
+       logger("Searching for ".$search." - type ".$type." conversation ".$conv_id, LOGGER_DEBUG);
 
        if ($search != '') {
                $sql_extra = "AND `name` LIKE '%%" . dbesc($search) . "%%'";
@@ -239,6 +239,12 @@ function acl_content(App $a)
        $items = array_merge($groups, $contacts);
 
        if ($conv_id) {
+               // In multi threaded posts the conv_id is not the parent of the whole thread
+               $parent_item = dba::selectFirst('item', ['parent'], ['id' => $conv_id]);
+               if (DBM::is_result($parent_item)) {
+                       $conv_id = $parent_item['parent'];
+               }
+
                /*
                 * if $conv_id is set, get unknown contacts in thread
                 * but first get known contacts url to filter them out

diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index 3f2edd2e20cefedafe4109194cf628ca096ed425..f1d1e11a542a26835b0700e25221fd36493ef044 100644 (file)
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -99,6 +99,24 @@ class Cache extends \Friendica\BaseObject
                return $return;
        }
 
+       /**
+        * @brief Delete a value from the cache
+        *
+        * @param string $key The key to the cached data
+        *
+        * @return bool
+        */
+       public static function delete($key)
+       {
+               $time = microtime(true);
+
+               $return = self::getDriver()->delete($key);
+
+               self::getApp()->save_timestamp($time, 'cache_write');
+
+               return $return;
+       }
+
        /**
         * @brief Remove outdated data from the cache
         *