From: Roland Haeder <roland@mxchange.org>
Date: Tue, 10 Nov 2015 18:05:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master' into social-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a0b9aeb43ef1b08e8dd7fe25101c515a0df53e7f;p=quix0rs-gnu-social.git

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

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

a0b9aeb43ef1b08e8dd7fe25101c515a0df53e7f
diff --cc .gitignore
index b9289b7c2a,41084c45cd..51ac39e6f2
--- a/.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 lib/activityutils.php
index ac7eb94213,ef2e232243..bb430c6f78
--- a/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;
              }