Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --cc .gitignore
index b9289b7c2af432167ff68d572b7aad8610965f3e,41084c45cd1cf2e0a198bef83e7fffcc2cf1d5ae..51ac39e6f29f103367ad7ef80db8d1f8a7b28ed8
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,36 -1,32 +1,11 @@@
--avatar/*
--background/*
--files/*
--file/*
--local/*
--_darcs/*
--logs/*
--log/*
--run/*
--config.php
--.htaccess
--httpd.conf
--*.tmproj
--dataobject.ini
--*~
--*.bak
--*.orig
--*.rej
--.#*
--*.swp
--.buildpath
--.project
--.settings
--TODO.rym
--config-*.php
--good-config.php
--lac08.log
--php.log
--.DS_Store
--nbproject
--*.mo
- *log*
- htaccess-sample
- installer.txt
- extlib/DB.php
- .gitmodules
 -
++/nbproject/private/
++/nbproject/*~
++/manifest.mf
++/build/
++/dist/
++/data/*
++/*.properties
++/*-ejb/nbproject/private/
++/*-ejb/nbproject/*~
++/*-ejb/build/
++/*-ejb/dist/

diff --cc actions/doc.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc lib/activity.php
Simple merge

diff --cc lib/activityutils.php
index ac7eb9421334cee2b508aca2bb827fb2cc1faf17,ef2e23224374b6a9ddd9629ef366e7f19ed0bdb7..bb430c6f7849b8f0818b18933d190f1d7005aab9
--- 1/lib/activityutils.php
--- 2/lib/activityutils.php
+++ b/lib/activityutils.php
@@@ -348,10 -348,10 +348,10 @@@ class ActivityUtil
          return null;
      }
  
-     static function compareTypes($type, array $objects)    // this does verbs too!
 -    static function compareTypes($type, $objects)
++    static function compareTypes($type, array $objects)
      {
          $type = self::resolveUri($type);
 -        foreach ((array)$objects as $object) {
 +        foreach ($objects as $object) {
              if ($type === self::resolveUri($object)) {
                  return true;
              }

diff --cc lib/noticelistitem.php
Simple merge

diff --cc plugins/Favorite/classes/Fave.php
Simple merge

diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge

diff --cc plugins/OStatus/classes/FeedSub.php
Simple merge

diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge

diff --cc plugins/WebFinger/WebFingerPlugin.php
Simple merge