Merge branch '0.9.x' into testing

3 files changed, 12 insertions, 8 deletions

diff --git a/scripts/fixup_utf8.php b/scripts/fixup_utf8.php
index 5a9fba7c3..30befadfd 100755
--- a/scripts/fixup_utf8.php
+++ b/scripts/fixup_utf8.php
@@ -145,7 +145,7 @@ class UTF8FixerUpper
 
             echo "$id...";
 
-            $result =& $this->dbu->execute($sth, array($content, $rendered, $id));
+            $result = $this->dbu->execute($sth, array($content, $rendered, $id));
 
             if (PEAR::isError($result)) {
                 echo "ERROR: " . $result->getMessage() . "\n";
@@ -209,7 +209,7 @@ class UTF8FixerUpper
 
             echo "$id...";
 
-            $result =& $this->dbu->execute($sth, array($fullname, $location, $bio, $id));
+            $result = $this->dbu->execute($sth, array($fullname, $location, $bio, $id));
 
             if (PEAR::isError($result)) {
                 echo "ERROR: " . $result->getMessage() . "\n";
@@ -273,7 +273,7 @@ class UTF8FixerUpper
 
             echo "$id...";
 
-            $result =& $this->dbu->execute($sth, array($fullname, $location, $description, $id));
+            $result = $this->dbu->execute($sth, array($fullname, $location, $description, $id));
 
             if (PEAR::isError($result)) {
                 echo "ERROR: " . $result->getMessage() . "\n";
@@ -330,7 +330,7 @@ class UTF8FixerUpper
 
             echo "$id...";
 
-            $result =& $this->dbu->execute($sth, array($content, $rendered, $id));
+            $result = $this->dbu->execute($sth, array($content, $rendered, $id));
 
             if (PEAR::isError($result)) {
                 echo "ERROR: " . $result->getMessage() . "\n";
diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh
index d40d4724f..777711fb5 100755
--- a/scripts/setup_status_network.sh
+++ b/scripts/setup_status_network.sh
@@ -19,8 +19,8 @@ done
 
 mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $SITEDB << ENDOFCOMMANDS
 
-GRANT INSERT,SELECT,UPDATE,DELETE ON $database.* TO '$username'@'localhost' IDENTIFIED BY '$password';
-GRANT INSERT,SELECT,UPDATE,DELETE ON $database.* TO '$username'@'%' IDENTIFIED BY '$password';
+GRANT ALL ON $database.* TO '$username'@'localhost' IDENTIFIED BY '$password';
+GRANT ALL ON $database.* TO '$username'@'%' IDENTIFIED BY '$password';
 INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created)
 VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now());
 
diff --git a/scripts/updateavatarurl.php b/scripts/updateavatarurl.php
index dfcfc118c..617c2e24c 100644
--- a/scripts/updateavatarurl.php
+++ b/scripts/updateavatarurl.php
@@ -60,7 +60,8 @@ try {
             }
         }
     } else {
-        throw new Exception("You have to provide an ID or nickname or 'all'.");
+        show_help();
+        exit(1);
     }
 } catch (Exception $e) {
     print $e->getMessage()."\n";
@@ -123,6 +124,9 @@ function updateAvatars($user)
     }
 
     if (have_option('v', 'verbose')) {
-        print "DONE.\n";
+        print "DONE.";
+    }
+    if (!have_option('q', 'quiet') || have_option('v', 'verbose')) {
+        print "\n";
     }
 }