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, 11 insertions, 11 deletions

diff --git a/scripts/fixup_notices_rendered.php b/scripts/fixup_notices_rendered.php
index c6c925729..c27185546 100755
--- a/scripts/fixup_notices_rendered.php
+++ b/scripts/fixup_notices_rendered.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__) . '/..'));
@@ -31,20 +31,20 @@ require_once(INSTALLDIR . '/lib/common.php');
 
 common_log(LOG_INFO, 'Starting to render old notices.');
 
-$start_at = ($argc > 1) ? $argv[1] : NULL;
+$start_at = ($argc > 1) ? $argv[1] : null;
 
 $notice = new Notice();
 if ($start_at) {
-	$notice->whereAdd('id >= ' . $start_at);
+    $notice->whereAdd('id >= ' . $start_at);
 }
 $cnt = $notice->find();
 
 while ($notice->fetch()) {
-	common_log(LOG_INFO, 'Pre-rendering notice #' . $notice->id);
-	$original = clone($notice);
-	$notice->rendered = common_render_content($notice->content, $notice);
-	$result = $notice->update($original);
-	if (!$result) {
-		common_log_db_error($notice, 'UPDATE', __FILE__);
-	}
+    common_log(LOG_INFO, 'Pre-rendering notice #' . $notice->id);
+    $original = clone($notice);
+    $notice->rendered = common_render_content($notice->content, $notice);
+    $result = $notice->update($original);
+    if (!$result) {
+        common_log_db_error($notice, 'UPDATE', __FILE__);
+    }
 }