Now the bugfix really should work

diff --git a/include/Contact.php b/include/Contact.php
index c7b512cea12f50530880f3f5612d5771a2bb36b9..f69454e39e782b75ddb88f1fda7e313a2ad57173 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -213,19 +213,22 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
        $r = dba::inArray($s);
 
        // Fetch the data from the contact table with "uid=0" (which is filled automatically)
-       if (!dbm::is_result($r))
+       if (!dbm::is_result($r)) {
                $s = dba::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
                        `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
                        FROM `contact` WHERE `nurl` = ? AND `uid` = 0",
                                normalise_link($url));
-       $r = dba::inArray($s);
+               $r = dba::inArray($s);
+       }
 
        // Fetch the data from the gcontact table
-       if (!dbm::is_result($r))
+       if (!dbm::is_result($r)) {
                $s = dba::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
                        `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
                        FROM `gcontact` WHERE `nurl` = ?",
                                normalise_link($url));
+               $r = dba::inArray($s);
+       }
 
        if (dbm::is_result($r)) {
                // If there is more than one entry we filter out the connector networks

diff --git a/include/dba.php b/include/dba.php
index a7689bc0f40807da4c36f5899d98f090d5c82310..6bb18a0b744c5d63d12ed7f72c7f1d5741d57cf7 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -1338,6 +1338,10 @@ class dba {
         * @return array Data array
         */
        static public function inArray($stmt, $do_close = true) {
+               if (is_bool($stmt)) {
+                       return $stmt;
+               }
+
                $data = array();
                while ($row = self::fetch($stmt)) {
                        $data[] = $row;

diff --git a/mod/hovercard.php b/mod/hovercard.php
index 83306aa11633c405f6dd9439f29ae19de6872786..26c60625195dbbd73fb322cf35e64b60acb4b41c 100644 (file)
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -52,7 +52,6 @@ function hovercard_content() {
                // Search for contact data
                $contact = get_contact_details_by_url($nurl);
        }
-
        if(!is_array($contact))
                return;