Merge branch 'master' into nightly

Some merge requests that were aimed at master

diff --git a/UPGRADE b/UPGRADE
index d2cd365e55a9deb1e4bce5ed1acd339543994d8c..3a1dd8a9b9a3b324ababe0256476790c57992b29 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -27,13 +27,13 @@ and follow this procedure:
    The upgrade script will likely take a long time because it will
     upgrade the tables to another character encoding and make other
     automated upgrades. Make sure it ends without errors. If you get
-    errors, create a new task on https://bugz.foocorp.net/
+    errors, create a new task on https://git.gnu.io/gnu/gnu-social/issues
 
 4. Start your queue daemons again (you can run this command even if you
     do not use the queue daemons):
     $ bash scripts/startdaemons.sh
 
-5. Report any issues at https://bugz.foocorp.net/ (tag GNU social)
+5. Report any issues at https://git.gnu.io/gnu/gnu-social/issues
 
 If you are using ssh keys to log in to your server, you can make this
 procedure pretty painless (assuming you have automated backups already).
@@ -69,7 +69,7 @@ variant of this command (you will be prompted for the database password):
 
 2. Unpack your GNU social code to a fresh directory. You can do this
     by cloning our git repository:
-    $ git clone https://gitorious.org/social/mainline.git gnusocial
+    $ git clone https://git.gnu.io/gnu/gnu-social.git gnusocial
 
 3. Synchronize your local files to the GNU social directory. These 
     will be the local files such as avatars, config and files:
@@ -91,8 +91,8 @@ variant of this command (you will be prompted for the database password):
    The upgrade script will likely take a long time because it will
     upgrade the tables to another character encoding and make other
     automated upgrades. Make sure it ends without errors. If you get
-    errors, create a new task on https://bugz.foocorp.net/
+    errors, create a new task on https://git.gnu.io/gnu/gnu-social/issues
 
 6. Start your queue daemons: 'bash scripts/startdaemons.sh'
 
-7. Report any issues at https://bugz.foocorp.net/ (tag GNU social)
+7. Report any issues at https://git.gnu.io/gnu/gnu-social/issues

diff --git a/lib/activityobject.php b/lib/activityobject.php
index 2fe52eefcc5a84f883757f9aba8818446d1a657b..87eea13727e3261c8829a8459dad19b42113caab 100644 (file)
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -298,7 +298,7 @@ class ActivityObject
         if (!empty($guidEl)) {
             $this->id = $guidEl->textContent;
 
-            if ($guidEl->hasAttribute('isPermaLink')) {
+            if ($guidEl->hasAttribute('isPermaLink') && $guidEl->getAttribute('isPermaLink') != 'false') {
                 // overwrites <link>
                 $this->link = $this->id;
             }

diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php
index 3a3890b75f56b8900882ea0db1df021926b9d50f..eff3aabe25eb608dcd4b97b5ba32b068556093b0 100644 (file)
--- a/lib/noticelistitem.php
+++ b/lib/noticelistitem.php
@@ -235,8 +235,9 @@ class NoticeListItem extends Widget
     function showAuthor()
     {
         $attrs = array('href' => $this->profile->profileurl,
-                       'class' => 'h-card p-author',
+                       'class' => 'h-card',
                        'title' => $this->profile->getNickname());
+        if(empty($this->repeat)) { $attrs['class'] .= ' p-author'; }
 
         if (Event::handle('StartShowNoticeItemAuthor', array($this->profile, $this->out, &$attrs))) {
             $this->out->elementStart('a', $attrs);

diff --git a/plugins/OStatus/classes/FeedSub.php b/plugins/OStatus/classes/FeedSub.php
index d0ac83b56d754d96946c3c6bdd18c86e553c76ed..6585e9ffb71f60f5c7a5fdd889f982b0f0ed716f 100644 (file)
--- a/plugins/OStatus/classes/FeedSub.php
+++ b/plugins/OStatus/classes/FeedSub.php
@@ -355,7 +355,7 @@ class FeedSub extends Managed_DataObject
             $response = $client->post($hub, $headers, $post);
             $status = $response->getStatus();
             // PuSH specificed response status code
-            if ($status == 202) {
+            if ($status == 202  || $status == 204) {
                 common_log(LOG_INFO, __METHOD__ . ': sub req ok, awaiting verification callback');
                 return;
             } else if ($status >= 200 && $status < 300) {

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index dbdbe885234eb4a200ac6e14fefd4a9bfeed6994..4d1c676844c51c5e9736dcc1b043a7525cbc2873 100644 (file)
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -828,11 +828,13 @@ class Ostatus_profile extends Managed_DataObject
             }
         }
 
+        $obj = ActivityUtils::getFeedAuthor($feedEl);
+
         // @todo FIXME: We should check whether this feed has elements
         // with different <author> or <dc:creator> elements, and... I dunno.
         // Do something about that.
 
-        $obj = ActivityObject::fromRssChannel($feedEl);
+        if(empty($obj)) { $obj = ActivityObject::fromRssChannel($feedEl); }
 
         return self::ensureActivityObjectProfile($obj, $hints);
     }

diff --git a/plugins/Share/SharePlugin.php b/plugins/Share/SharePlugin.php
index cfa93de7fa11c463270fdc83fe198c414b40c145..1f6ddbaa3fb723dea736748bb2217ff7247f83b1 100644 (file)
--- a/plugins/Share/SharePlugin.php
+++ b/plugins/Share/SharePlugin.php
@@ -199,7 +199,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin
                            'class' => 'h-card p-author',
                            'title' => $repeater->getFancyName());
 
-            $nli->out->elementStart('span', 'repeat h-entry');
+            $nli->out->elementStart('span', 'repeat');
 
             // TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
             $nli->out->raw(_('Repeated by').' ');