Merge branch 'master' of git@github.com:gallery/gallery3

Conflicts:
	modules/gallery/views/in_place_edit.html.php

1 files changed, 1 insertions, 10 deletions

diff --git a/modules/akismet/controllers/admin_akismet.php b/modules/akismet/controllers/admin_akismet.php
index ca3a1473..4847db53 100644
--- a/modules/akismet/controllers/admin_akismet.php
+++ b/modules/akismet/controllers/admin_akismet.php
@@ -25,17 +25,8 @@ class Admin_Akismet_Controller extends Admin_Controller {
       // @todo move the "post" handler part of this code into a separate function
       access::verify_csrf();
 
-      $valid = $form->validate();
-
-      if ($valid) {
+      if ($form->validate()) {
         $new_key = $form->configure_akismet->api_key->value;
-        if ($new_key && !akismet::validate_key($new_key)) {
-          $form->configure_akismet->api_key->add_error("invalid", 1);
-          $valid = false;
-        }
-      }
-
-      if ($valid) {
         $old_key = module::get_var("akismet", "api_key");
         if ($old_key && !$new_key) {
           message::success(t("Your Akismet key has been cleared."));