Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 19 insertions, 16 deletions

diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index b1ae1d581..5075c12df 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -20,8 +20,8 @@
 
 # Abort if called from a web server
 if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
-	print "This script must be run from the command line\n";
-	exit();
+    print "This script must be run from the command line\n";
+    exit();
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
@@ -33,20 +33,23 @@ require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class PublicQueueHandler extends XmppQueueHandler {
-	
-	function transport() {
-		return 'public';
-	}
-	
-	function handle_notice($notice) {
-		try {
-			return jabber_public_notice($notice);
-		} catch (XMPPHP_Exception $e) {
-			$this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
-			die($e->getMessage());
-		}
-	}
+class PublicQueueHandler extends XmppQueueHandler
+{
+    
+    function transport()
+    {
+        return 'public';
+    }
+    
+    function handle_notice($notice)
+    {
+        try {
+            return jabber_public_notice($notice);
+        } catch (XMPPHP_Exception $e) {
+            $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+            die($e->getMessage());
+        }
+    }
 }
 
 ini_set("max_execution_time", "0");