diff options
| author | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-09-20 04:30:34 +0300 |
|---|---|---|
| committer | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-09-20 04:30:34 +0300 |
| commit | ce80259d6939e43aaea34eba7bea4b2a602a5019 (patch) | |
| tree | 7ca81d874b62c5a2c0244657aa903d565a7e6b04 /modules/comment | |
| parent | ba950bec0c84a1467aa2545ca815d5af7b0b002b (diff) | |
| parent | 93d1a8103e757a87fb006f2389f0ee24497367a7 (diff) | |
Merge remote branch 'gallery3/master'
Diffstat (limited to 'modules/comment')
| -rw-r--r-- | modules/comment/controllers/admin_manage_comments.php | 2 | ||||
| -rw-r--r-- | modules/comment/controllers/comments.php | 1 | ||||
| -rw-r--r-- | modules/comment/helpers/comment.php | 3 |
3 files changed, 4 insertions, 2 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); } diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php index 7aa007cb..958f2f3d 100644 --- a/modules/comment/helpers/comment.php +++ b/modules/comment/helpers/comment.php @@ -38,7 +38,8 @@ class comment_Core { ->error_messages("invalid", t("You must enter a valid email address")); $group->input("url") ->label(t("Website (hidden)")) - ->id("g-url"); + ->id("g-url") + ->error_messages("url", t("You must enter a valid url")); $group->textarea("text") ->label(t("Comment")) ->id("g-text") |