Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-19 03:03:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

And some more notices removed ... (#5533)

Browse source 
* Fix for vanishing notes

* The field needs to be part of the selected fields ...

* And some more notes ...
This commit is contained in:
Michael Vogel 2018-07-31 07:54:25 +02:00 committed by Tobias Diekershoff
parent 2c0ad47dfc
commit b552b711ee
4 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mod/parse_url.php
View file

@ -24,21 +24,21 @@ function parse_url_content(App $a) {
$br = "\n"; $br = "\n";
if (x($_GET,"binurl")) { if (!empty($_GET["binurl"])) {
$url = trim(hex2bin($_GET["binurl"])); $url = trim(hex2bin($_GET["binurl"]));
} else { } else {
$url = trim($_GET["url"]); $url = trim($_GET["url"]);
} }
if ($_GET["title"]) { if (!empty($_GET["title"])) {
$title = strip_tags(trim($_GET["title"])); $title = strip_tags(trim($_GET["title"]));
} }
if ($_GET["description"]) { if (!empty($_GET["description"])) {
$text = strip_tags(trim($_GET["description"])); $text = strip_tags(trim($_GET["description"]));
} }
if ($_GET["tags"]) { if (!empty($_GET["tags"])) {
$arr_tags = ParseUrl::convertTagsToArray($_GET["tags"]); $arr_tags = ParseUrl::convertTagsToArray($_GET["tags"]);
if (count($arr_tags)) { if (count($arr_tags)) {
$str_tags = $br . implode(" ", $arr_tags) . $br; $str_tags = $br . implode(" ", $arr_tags) . $br;
@ -103,9 +103,9 @@ function parse_url_content(App $a) {
killme(); killme();
} }
// If there is allready some content information submitted we don't // If there is already some content information submitted we don't
// need to parse the url for content. // need to parse the url for content.
if ($url && $title && $text) { if (!empty($url) && !empty($title) && !empty($text)) {
$title = str_replace(["\r","\n"],["",""],$title); $title = str_replace(["\r","\n"],["",""],$title);

4
src/Protocol/DFRN.php
View file

@ -2422,13 +2422,17 @@ class DFRN
$owner_unknown = (isset($owner["contact-unknown"]) && $owner["contact-unknown"]); $owner_unknown = (isset($owner["contact-unknown"]) && $owner["contact-unknown"]);
$item["owner-name"] = $owner["name"];
$item["owner-link"] = $owner["link"]; $item["owner-link"] = $owner["link"];
$item["owner-avatar"] = $owner["avatar"];
$item["owner-id"] = Contact::getIdForURL($owner["link"], 0); $item["owner-id"] = Contact::getIdForURL($owner["link"], 0);
// fetch the author // fetch the author
$author = self::fetchauthor($xpath, $entry, $importer, "atom:author", true); $author = self::fetchauthor($xpath, $entry, $importer, "atom:author", true);
$item["author-name"] = $author["name"];
$item["author-link"] = $author["link"]; $item["author-link"] = $author["link"];
$item["author-avatar"] = $author["avatar"];
$item["author-id"] = Contact::getIdForURL($author["link"], 0); $item["author-id"] = Contact::getIdForURL($author["link"], 0);
$item["title"] = XML::getFirstNodeValue($xpath, "atom:title/text()", $entry); $item["title"] = XML::getFirstNodeValue($xpath, "atom:title/text()", $entry);

4
src/Protocol/OStatus.php
View file

@ -350,6 +350,10 @@ class OStatus
$header["origin"] = 0; $header["origin"] = 0;
$header["gravity"] = GRAVITY_COMMENT; $header["gravity"] = GRAVITY_COMMENT;
if (!is_object($doc->firstChild)) {
return false;
}
$first_child = $doc->firstChild->tagName; $first_child = $doc->firstChild->tagName;
if ($first_child == "feed") { if ($first_child == "feed") {

12
src/Worker/Delivery.php
View file

@ -59,7 +59,7 @@ class Delivery extends BaseObject
} }
$parent_id = intval($item['parent']); $parent_id = intval($item['parent']);
$condition = ['id' => [$item_id, $parent_id], 'visible' => true, 'moderated' => false]; $condition = ['id' => [$item_id, $parent_id], 'moderated' => false];
$params = ['order' => ['id']]; $params = ['order' => ['id']];
$itemdata = Item::select([], $condition, $params); $itemdata = Item::select([], $condition, $params);
@ -75,6 +75,16 @@ class Delivery extends BaseObject
} }
DBA::close($itemdata); DBA::close($itemdata);
if (empty($target_item)) {
logger('Item ' . $item_id . "wasn't found. Quitting here.");
return;
}
if (empty($parent)) {
logger('Parent ' . $parent_id . ' for item ' . $item_id . "wasn't found. Quitting here.");
return;
}
$uid = $target_item['contact-uid']; $uid = $target_item['contact-uid'];
// avoid race condition with deleting entries // avoid race condition with deleting entries