Merge branch 'master' into talmdal_dev

2 files changed, 2 insertions, 1 deletions

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 730db9ae..ea15418f 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -107,6 +107,7 @@ class Albums_Controller extends Items_Controller {
 
     if ($valid) {
       $album->save();
+      module::event("album_add_form_completed", $album, $form);
       log::success("content", "Created an album",
                    html::anchor("albums/$album->id", "view album"));
       message::success(t("Created album %album_title",
diff --git a/modules/gallery/controllers/reauthenticate.php b/modules/gallery/controllers/reauthenticate.php
index b2a67f01..3503d80a 100644
--- a/modules/gallery/controllers/reauthenticate.php
+++ b/modules/gallery/controllers/reauthenticate.php
@@ -63,7 +63,7 @@ class Reauthenticate_Controller extends Controller {
     $group->password("password")->label(t("Password"))->id("g-password")->class(null)
       ->callback("auth::validate_too_many_failed_auth_attempts")
       ->callback("user::valid_password")
-      ->error_messages("invalid", t("Incorrect password"))
+      ->error_messages("invalid_password", t("Incorrect password"))
       ->error_messages(
         "too_many_failed_auth_attempts",
         t("Too many incorrect passwords.  Try again later"));