From: Roland Haeder <roland@mxchange.org>
Date: Wed, 10 Sep 2014 20:02:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fb4b004435403dd0d4126a0c11c9fa5c557e9dba;p=quix0rs-gnu-social.git

Merge remote-tracking branch 'upstream/master'

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

Conflicts:
	lib/installer.php
	plugins/Meteor/MeteorPlugin.php
	plugins/TwitterBridge/daemons/synctwitterfriends.php
	scripts/getvaliddaemons.php
---

fb4b004435403dd0d4126a0c11c9fa5c557e9dba
diff --cc plugins/TwitterBridge/daemons/synctwitterfriends.php
index d56e5abb64,8b8ffbfd49..913cbbd4da
--- a/plugins/TwitterBridge/daemons/synctwitterfriends.php
+++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php
@@@ -30,8 -30,8 +30,8 @@@ Batch script for synching local friend
  
  END_OF_TRIM_HELP;
  
 -require_once INSTALLDIR . '/scripts/commandline.inc';
 +require_once INSTALLDIR . '/scripts/commandline.inc.php';
- require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+ require_once dirname(__DIR__) . '/twitter.php';
  
  /**
   * Daemon to sync local friends with Twitter friends
diff --cc plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 0f03a385a7,74fc77cd79..47ba57f7ba
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@@ -36,10 -36,10 +36,10 @@@ Batch script for retrieving Twitter mes
  
  END_OF_TRIM_HELP;
  
 -require_once INSTALLDIR . '/scripts/commandline.inc';
 +require_once INSTALLDIR . '/scripts/commandline.inc.php';
  require_once INSTALLDIR . '/lib/common.php';
  require_once INSTALLDIR . '/lib/daemon.php';
- require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+ require_once dirname(__DIR__) . '/twitter.php';
  
  /**
   * Fetch statuses from Twitter
diff --cc scripts/getvaliddaemons.php
index 7d000bad03,448fbb6d32..f7aa0f60f8
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@@ -33,10 -33,10 +33,10 @@@ by the startdaemons scrip
  
  ENDOFHELP;
  
- // No error reporting to avoid invalid daemon names
- error_reporting(0);
+ // No unnecessary error reporting to avoid invalid daemon names
+ error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE);
  
 -require_once INSTALLDIR.'/scripts/commandline.inc';
 +require_once INSTALLDIR.'/scripts/commandline.inc.php';
  
  $daemons = array();