From 7a6952720c5aa210d76c3cc716e536edd710cf56 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 25 Jul 2009 14:48:10 -0700
Subject: Pass the  variable when the "user_edit_form" event is fired.

---
 modules/user/helpers/user.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

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;
   }
 
-- 
cgit v1.2.3


From 00cd2b646d535e48a21b0b7ceff028ad1bdc2c28 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 25 Jul 2009 15:00:57 -0700
Subject: fix for ticket #574. The user->url database wasn't being set when the
 user was updated via the admin panel.

---
 modules/user/controllers/admin_users.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules')

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;
-- 
cgit v1.2.3


From f8516b55d2f0fcf145bb6c27475d633e8a89ccf8 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 25 Jul 2009 15:18:41 -0700
Subject: Fix for ticket #594. Forced the directory name to be required when
 editting the album.

---
 modules/gallery/helpers/album.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules')

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")
-- 
cgit v1.2.3