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

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

diff --cc actions/apisearchatom.php
Simple merge

diff --cc actions/apitimelinefriends.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc lib/action.php
Simple merge

diff --cc lib/activity.php
Simple merge

diff --cc lib/installer.php
index 027a48c4f6c3287f6856d37117225337546f62b5,346c706d61aab1fd4fe8a05363c4edd72e8c64be..ca484482d0da0759cd2d11e4934c2e4b76604c50
--- 1/lib/installer.php
--- 2/lib/installer.php
+++ b/lib/installer.php
@@@ -285,6 -285,11 +285,15 @@@ abstract class Installe
          $this->updateStatus("Checking database...");
          $conn = $this->connectDatabase($dsn);
  
 -        if (!$conn instanceof DB_common) {
++        if (!is_object($conn)) {
++            // No object at all
++            throw new Exception('Fatal error: conn is no object.');
++        } elseif (!$conn instanceof DB_common) {
+             // Is not the right instance
+             throw new Exception('Cannot connect to database: ' . $conn->getMessage());
+         }
+ 
++
          // ensure database encoding is UTF8
          if ($this->dbtype == 'mysql') {
              // @fixme utf8m4 support for mysql 5.5?

diff --cc lib/noticelistitem.php
Simple merge

diff --cc lib/searchaction.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc plugins/BitlyUrl/BitlyUrlPlugin.php
Simple merge

diff --cc plugins/Mapstraction/MapstractionPlugin.php
Simple merge

diff --cc plugins/OStatus/lib/magicenvelope.php
Simple merge

diff --cc plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php
Simple merge

diff --cc plugins/Sitemap/SitemapPlugin.php
Simple merge