Small cleanup
This commit is contained in:
parent
5bbc8a14ce
commit
2a4ebaa438
1 changed files with 5 additions and 4 deletions
|
@ -553,7 +553,6 @@ class diaspora {
|
||||||
|
|
||||||
$msg = array("message" => $x, "author" => $author);
|
$msg = array("message" => $x, "author" => $author);
|
||||||
|
|
||||||
// We don't really need this, but until the work is unfinished we better will keep this
|
|
||||||
$msg["key"] = self::get_key($msg["author"]);
|
$msg["key"] = self::get_key($msg["author"]);
|
||||||
|
|
||||||
return $msg;
|
return $msg;
|
||||||
|
@ -736,10 +735,12 @@ class diaspora {
|
||||||
$msg_text = unxmlify($mesg->text);
|
$msg_text = unxmlify($mesg->text);
|
||||||
$msg_created_at = datetime_convert("UTC", "UTC", notags(unxmlify($mesg->created_at)));
|
$msg_created_at = datetime_convert("UTC", "UTC", notags(unxmlify($mesg->created_at)));
|
||||||
|
|
||||||
if ($mesg->diaspora_handle)
|
// "diaspora_handle" is the element name from the old version
|
||||||
$msg_author = notags(unxmlify($mesg->diaspora_handle));
|
// "author" is the element name from the new version
|
||||||
elseif ($mesg->author)
|
if ($mesg->author)
|
||||||
$msg_author = notags(unxmlify($mesg->author));
|
$msg_author = notags(unxmlify($mesg->author));
|
||||||
|
elseif ($mesg->diaspora_handle)
|
||||||
|
$msg_author = notags(unxmlify($mesg->diaspora_handle));
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue