Resolve conflicts and convert _t( to _( where it was introduced again.

[quix0rs-gnu-social.git] / fixup_replies.php

diff --git a/fixup_replies.php b/fixup_replies.php
index a9ada0756b7627a067b0820e6093a4a643bef526..51ecf7afaa4c1ca59d22e4fec81f8b883bfdc5fb 100755 (executable)
--- a/fixup_replies.php
+++ b/fixup_replies.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', dirname(__FILE__));
@@ -35,6 +35,6 @@ $notice = new Notice();
 $cnt = $notice->find();
 
 while ($notice->fetch()) {
-       common_log(LOG_INFO, 'Getting replies for notice #' . $notice->id);
-       common_save_replies($notice);
+    common_log(LOG_INFO, 'Getting replies for notice #' . $notice->id);
+    common_save_replies($notice);
 }