From dea8bef472b37b889c027e102292ece6306f7dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 15 Dec 2016 09:32:32 +0100
Subject: [PATCH] more reverts ...
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
include/Probe.php | 2 +-
include/feed.php | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/Probe.php b/include/Probe.php
index 779476bce..5c2ba86cc 100644
--- a/include/Probe.php
+++ b/include/Probe.php
@@ -232,7 +232,7 @@ class Probe {
if ($data["photo"] != "")
$data["baseurl"] = matching_url(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
else
- $data["photo"] = $a->get_baseurl().'/images/person-175.jpg';
+ $data["photo"] = App::get_baseurl().'/images/person-175.jpg';
if (!isset($data["name"]) OR ($data["name"] == "")) {
if (isset($data["nick"]))
diff --git a/include/feed.php b/include/feed.php
index 7ce0729c6..579ff7caa 100644
--- a/include/feed.php
+++ b/include/feed.php
@@ -59,8 +59,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
if ($attributes->name == "href")
$author["author-link"] = $attributes->textContent;
- $author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue;
-
if ($author["author-link"] == "")
$author["author-link"] = $author["author-id"];
@@ -144,10 +142,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
$author["owner-link"] = $contact["url"];
$author["owner-name"] = $contact["name"];
$author["owner-avatar"] = $contact["thumb"];
-
- // This is no field in the item table. So we have to unset it.
- unset($author["author-nick"]);
- unset($author["author-id"]);
}
$header = array();