Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

* '0.9.x' of gitorious.org:statusnet/mainline:
  Add a "grandfather" creation date cutoff to RequireValidatedEmail plugin; will allow us to use this for temporary emergency moderation of new registrations without affecting older accounts.

diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh
index d40d4724f23b8c39206e9cccef43e6c0c864c7f2..777711fb55a29d24f836e1b3bca8e2a602b3415c 100755 (executable)
--- 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());