Merge pull request #5226 from annando/even-more-abstraction

More item calls have been replaced with the new functions

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index e504849f7c11fbf5dbcfd337cd1af685ad13922b..f354f89c7d0074a962723edf8ec1f6dcd5c2707e 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1070,9 +1070,11 @@ class Contact extends BaseObject
                        'limit' => [$a->pager['start'], $a->pager['itemspage']]];
                $r = Item::select(local_user(), [], $condition, $params);
 
-               $o = conversation($a, dba::inArray($r), 'contact-posts', false);
+               $items = dba::inArray($r);
+               
+               $o = conversation($a, $items, 'contact-posts', false);
 
-               $o .= alt_pager($a, count($r));
+               $o .= alt_pager($a, count($items));
 
                return $o;
        }

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 2dcc0474062978c013ad0f567e3ff8b90aa72f0d..719148a8e65ace86c9f3ca069540c13dc434d59d 100644 (file)
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -1009,7 +1009,7 @@ class PortableContact
 
                // Maybe the page is unencrypted only?
                $xmlobj = @simplexml_load_string($serverret["body"], 'SimpleXMLElement', 0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
-               if (!$serverret["success"] || ($serverret["body"] == "") || (empty($xmlobj) == 0) || !is_object($xmlobj)) {
+               if (!$serverret["success"] || ($serverret["body"] == "") || empty($xmlobj) || !is_object($xmlobj)) {
                        $server_url = str_replace("https://", "http://", $server_url);
 
                        // We set the timeout to 20 seconds since this operation should be done in no time if the server was vital
@@ -1025,7 +1025,7 @@ class PortableContact
                        $xmlobj = @simplexml_load_string($serverret["body"], 'SimpleXMLElement', 0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
                }
 
-               if (!$serverret["success"] || ($serverret["body"] == "") || (empty($xmlobj) == 0) || !is_object($xmlobj)) {
+               if (!$serverret["success"] || ($serverret["body"] == "") || empty($xmlobj) || !is_object($xmlobj)) {
                        // Workaround for bad configured servers (known nginx problem)
                        if (!in_array($serverret["debug"]["http_code"], ["403", "404"])) {
                                $failure = true;

diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 31b7175baed161bd94ff1c5de153d24ba29b25a0..f4bcabdae8d276be9dbeffec05c80048f27da684 100644 (file)
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -68,6 +68,12 @@
 <script type="text/javascript" src="view/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js"></script>
 <script type="text/javascript" src="view/js/acl.js"></script>
 <script type="text/javascript" src="view/asset/base64/base64.min.js"></script>
+<script type="text/javascript" src="view/js/addon-hooks.js" ></script>
+{{if is_array($addon_hooks)}}
+{{foreach $addon_hooks as $addon_hook}}
+<script type="text/javascript" src="addon/{{$addon_hook}}/{{$addon_hook}}.js"></script>
+{{/foreach}}
+{{/if}}
 <script type="text/javascript" src="view/js/main.js"></script>
 
 <script type="text/javascript" src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js"></script>