Merge pull request #9643 from annando/profiler

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 779f5b83c3bb5ed65ecc98be3baae4c1263c1140..15ea69eeb94df1a40d0c770698a3aef767a3f4d5 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1568,7 +1568,7 @@ class Item
                        $item['network'] = Protocol::DFRN;
                        $item['protocol'] = Conversation::PARCEL_DIRECT;
 
-                       if (is_int($notify)) {
+                       if (in_array($notify, PRIORITIES)) {
                                $priority = $notify;
                        }
                } else {
@@ -2912,7 +2912,7 @@ class Item
                $_SESSION["authenticated"] = true;
                $_SESSION["uid"] = $contact['uid'];
 
-               return $result;
+               return (bool)$result;
        }
 
        /**
@@ -3537,18 +3537,18 @@ class Item
 
                if ($rendered_hash == ''
                        || $rendered_html == ''
-                       || $rendered_hash != BBCode::VERSION . '::' . hash('md5', $body)
+                       || $rendered_hash != hash('md5', BBCode::VERSION . '::' . $body)
                        || DI::config()->get('system', 'ignore_cache')
                ) {
                        self::addRedirToImageTags($item);
 
                        $item['rendered-html'] = BBCode::convert($item['body']);
-                       $item['rendered-hash'] = hash('md5', $body);
+                       $item['rendered-hash'] = hash('md5', BBCode::VERSION . '::' . $body);
 
                        $hook_data = ['item' => $item, 'rendered-html' => $item['rendered-html'], 'rendered-hash' => $item['rendered-hash']];
                        Hook::callAll('put_item_in_cache', $hook_data);
                        $item['rendered-html'] = $hook_data['rendered-html'];
-                       $item['rendered-hash'] = BBCode::VERSION . '::' . $hook_data['rendered-hash'];
+                       $item['rendered-hash'] = $hook_data['rendered-hash'];
                        unset($hook_data);
 
                        // Force an update if the generated values differ from the existing ones