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

3 files changed, 4 insertions, 2 deletions

diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 0263e0e1..f146bfb3 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -104,6 +104,7 @@ class album_Core {
     $group->textarea("description")->label(t("Description"))->value($parent->description);
     if ($parent->id != 1) {
       $group->input("dirname")->label(t("Directory Name"))->value($parent->name)
+        ->rules("required")
         ->callback("item::validate_no_slashes")
         ->error_messages("no_slashes", t("The directory name can't contain a \"/\""))
         ->callback("item::validate_no_trailing_period")
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 0a0086ff..043a4ee5 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -130,6 +130,7 @@ class Admin_Users_Controller extends Controller {
         $user->password = $form->edit_user->password->value;
       }
       $user->email = $form->edit_user->email->value;
+      $user->url = $form->edit_user->url->value;
       if ($form->edit_user->locale) {
         $desired_locale = $form->edit_user->locale->value;
         $user->locale = $desired_locale == "none" ? null : $desired_locale;
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index a153ab69..b1722a1e 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -37,7 +37,7 @@ class user_Core {
     $group->submit("")->value(t("Save"));
     $form->add_rules_from($user);
 
-    module::event("user_edit_form", $user);
+    module::event("user_edit_form", $user, $form);
     return $form;
   }
 
@@ -59,7 +59,7 @@ class user_Core {
     $form->add_rules_from($user);
     $form->edit_user->password->rules("-required");
 
-    module::event("user_edit_form_admin", $user);
+    module::event("user_edit_form_admin", $user, $form);
     return $form;
   }