Merge pull request #5700 from annando/issue-5653

Issue 5653: The mastodonemoji addon hadn't got all needed data.

diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md
index 1e077902d6ea2ca9504a879a04be603f3bfcdd45..5deaf98ff0608edbb2a85b08716fd276ca6dd1c9 100644 (file)
--- a/doc/Developers-Intro.md
+++ b/doc/Developers-Intro.md
@@ -33,7 +33,7 @@ If you don't want to translate the UI, or it is already done to your satisfactio
 Are you good at designing things?
 If you have seen Friendica you probably have ideas to improve it, haven't you?
 
-* If you would like to work with us on enhancing the user interface, please join the [UX Watchdogs forum](https://fc.oscp.info/profile/ux-watchdogs)
+* If you would like to work with us on enhancing the user interface, please join the [forum for Friendica development](https://forum.friendi.ca/profile/developers).
 * Make plans for a better Friendica interface design and share them with us.
 * Tell us if you are able to realize your ideas or what kind of help you need.
        We can't promise we have the right skills in the group but we'll try.

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index c9c750a83fdfdb57e7f1953c26c9072de1f44bad..0709a9550ea23b44c20468930c1d30369f1b65ea 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -271,9 +271,14 @@ class Feed {
                        }
                        $updated = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
 
-                       if (empty($updated)) {
+                       if (empty($updated) && !empty($published)) {
                                $updated = $published;
                        }
+
+                       if (empty($published) && !empty($updated)) {
+                               $published = $updated;
+                       }
+
                        if ($published != "") {
                                $item["created"] = $published;
                        }