Merge remote branch 'gallery3/master'

2 files changed, 2 insertions, 1 deletions

diff --git a/modules/comment/controllers/admin_manage_comments.php b/modules/comment/controllers/admin_manage_comments.php
index 0889dc4e..49bd85d5 100644
--- a/modules/comment/controllers/admin_manage_comments.php
+++ b/modules/comment/controllers/admin_manage_comments.php
@@ -25,7 +25,7 @@ class Admin_Manage_Comments_Controller extends Admin_Controller {
     db::build()
       ->delete("comments")
       ->where("state", "IN", array("deleted", "spam"))
-      ->where("updated", "<", "UNIX_TIMESTAMP() - 86400 * 7")
+      ->where("updated", "<", new Database_Expression("UNIX_TIMESTAMP() - 86400 * 7"))
       ->execute();
 
     // Redirect to the appropriate queue
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index ff0e9ce1..ded9743e 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -45,6 +45,7 @@ class Comments_Controller extends Controller {
         switch ($key) {
         case "guest_name":  $key = "name";  break;
         case "guest_email": $key = "email"; break;
+        case "guest_url":   $key = "url";   break;
         }
         $form->add_comment->inputs[$key]->add_error($error, 1);
       }