Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 23:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Warnings fixed

Browse source
This commit is contained in:
Michael 2018-07-08 09:37:05 +00:00
parent c25c3b5981
commit 3e797547a3
17 changed files with 55 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Protocol/DFRN.php
View file

@ -952,10 +952,10 @@ class DFRN
if (isset($parent_item)) {
$conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $item['parent-uri']]);
if (DBM::is_result($conversation)) {
if ($r['conversation-uri'] != '') {
if ($conversation['conversation-uri'] != '') {
$conversation_uri = $conversation['conversation-uri'];
}
if ($r['conversation-href'] != '') {
if ($conversation['conversation-href'] != '') {
$conversation_href = $conversation['conversation-href'];
}
}

4
src/Protocol/Diaspora.php
View file

@ -1349,7 +1349,7 @@ class Diaspora
$author = "";
// Fetch the author - for the old and the new Diaspora version
if ($source_xml->post->status_message->diaspora_handle) {
if ($source_xml->post->status_message && $source_xml->post->status_message->diaspora_handle) {
$author = (string)$source_xml->post->status_message->diaspora_handle;
} elseif ($source_xml->author && ($source_xml->getName() == "status_message")) {
$author = (string)$source_xml->author;
@ -2165,7 +2165,7 @@ class Diaspora
}
// Send all existing comments and likes to the requesting server
$comments = Item::select(['id', 'verb', 'self'], ['parent' => $item['id']]);
$comments = Item::select(['id', 'parent', 'verb', 'self'], ['parent' => $item['id']]);
while ($comment = Item::fetch($comments)) {
if ($comment['id'] == $comment['parent']) {
continue;

4
src/Protocol/OStatus.php
View file

@ -1173,12 +1173,12 @@ class OStatus
$guid = "";
preg_match("/guid='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "") {
if (!empty($matches[1])) {
$guid = $matches[1];
}
preg_match('/guid="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "") {
if (!empty($matches[1])) {
$guid = $matches[1];
}