Function renamed

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 25adb5ce2c8d1c70db33ee9258b0b3a00398f489..cc0042d6b7f33618b6af1ea20503cf121ac85932 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1766,15 +1766,15 @@ class DFRN
 
                $msg = [];
                $msg["uid"] = $importer["importer_uid"];
-               $msg["from-name"] = XML::queryValue($xpath, "dfrn:sender/dfrn:name/text()", $mail);
-               $msg["from-url"] = XML::queryValue($xpath, "dfrn:sender/dfrn:uri/text()", $mail);
-               $msg["from-photo"] = XML::queryValue($xpath, "dfrn:sender/dfrn:avatar/text()", $mail);
+               $msg["from-name"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:name/text()", $mail);
+               $msg["from-url"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:uri/text()", $mail);
+               $msg["from-photo"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:avatar/text()", $mail);
                $msg["contact-id"] = $importer["id"];
-               $msg["uri"] = XML::queryValue($xpath, "dfrn:id/text()", $mail);
-               $msg["parent-uri"] = XML::queryValue($xpath, "dfrn:in-reply-to/text()", $mail);
-               $msg["created"] = DateTimeFormat::utc(XML::queryValue($xpath, "dfrn:sentdate/text()", $mail));
-               $msg["title"] = XML::queryValue($xpath, "dfrn:subject/text()", $mail);
-               $msg["body"] = XML::queryValue($xpath, "dfrn:content/text()", $mail);
+               $msg["uri"] = XML::getFirstValue($xpath, "dfrn:id/text()", $mail);
+               $msg["parent-uri"] = XML::getFirstValue($xpath, "dfrn:in-reply-to/text()", $mail);
+               $msg["created"] = DateTimeFormat::utc(XML::getFirstValue($xpath, "dfrn:sentdate/text()", $mail));
+               $msg["title"] = XML::getFirstValue($xpath, "dfrn:subject/text()", $mail);
+               $msg["body"] = XML::getFirstValue($xpath, "dfrn:content/text()", $mail);
 
                Mail::insert($msg);
        }

diff --git a/src/Util/XML.php b/src/Util/XML.php
index ec4bbe15f1e2c6a1f470aeebc6e84abe1c5ee75e..039247cc7503f74195dc3c0888b8a86587b276de 100644 (file)
--- a/src/Util/XML.php
+++ b/src/Util/XML.php
@@ -488,13 +488,19 @@ class XML
                return $first_item->attributes;
        }
 
-       public static function queryValue($xpath, $search, $context)
+       public static function getFirstValue($xpath, $search, $context)
        {
-               $result = $xpath->query($search, $context)->item(0)->nodeValue;
+               $result = $xpath->query($search, $context);
                if (!is_object($result)) {
                        return '';
                }
-               return $result->nodeValue;
+
+               $first_item = $result->item(0);
+               if (!is_object($first_item)) {
+                       return '';
+               }
+
+               return $first_item->nodeValue;
        }
 
        /**