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

8 files changed, 15 insertions, 6 deletions

diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index 4ff24f86..516a8181 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -2,7 +2,7 @@
 <ul>
   <? foreach ($comments as $i => $comment): ?>
   <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
-    <img src="<?= $comment->author()->avatar_url(32, $theme->theme_url("images/avatar.jpg", true)) ?>"
+    <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
          class="gAvatar"
          alt="<?= p::clean($comment->author_name()) ?>"
          width="32"
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index ad0ae8f3..9fe7164b 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -106,7 +106,7 @@
     <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
       <td>
         <a href="#">
-          <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
+          <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
                class="gAvatar"
                alt="<?= p::clean($comment->author_name()) ?>"
                width="40"
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index ab72a0c8..3d17411c 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -2,7 +2,7 @@
 <li id="gComment-<?= $comment->id; ?>">
   <p class="gAuthor">
     <a href="#">
-      <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
+      <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
            class="gAvatar"
            alt="<?= p::clean($comment->author_name()) ?>"
            width="40"
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index fa25a4e0..f7251389 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -10,7 +10,7 @@
   <li id="gComment-<?= $comment->id ?>">
     <p class="gAuthor">
       <a href="#">
-        <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
+        <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
              class="gAvatar"
              alt="<?= p::clean($comment->author_name()) ?>"
              width="40"
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index b5dc6cb5..0a0086ff 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -48,8 +48,10 @@ class Admin_Users_Controller extends Controller {
         $desired_locale = $form->add_user->locale->value;
         $user->locale = $desired_locale == "none" ? null : $desired_locale;
       }
-
       $user->save();
+
+      module::event("user_add_form_admin_completed", $user, $form);
+
       message::success(t("Created user %user_name", array("user_name" => p::clean($user->name))));
       print json_encode(array("result" => "success"));
     } else {
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 46f799c5..0bf2e81d 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -39,6 +39,7 @@ class Users_Controller extends REST_Controller {
         $user->locale = $desired_locale == "none" ? null : $desired_locale;
       }
       $user->save();
+      module::event("user_edit_form_completed", $user, $form);
 
       message::success(t("User information updated."));
       print json_encode(
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 53e9052c..a153ab69 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -36,6 +36,8 @@ class user_Core {
     $group->input("url")->label(t("URL"))->id("gUrl")->value($user->url);
     $group->submit("")->value(t("Save"));
     $form->add_rules_from($user);
+
+    module::event("user_edit_form", $user);
     return $form;
   }
 
@@ -56,6 +58,8 @@ class user_Core {
     $group->submit("")->value(t("Modify User"));
     $form->add_rules_from($user);
     $form->edit_user->password->rules("-required");
+
+    module::event("user_edit_form_admin", $user);
     return $form;
   }
 
@@ -75,6 +79,8 @@ class user_Core {
     $group->submit("")->value(t("Add User"));
     $user = ORM::factory("user");
     $form->add_rules_from($user);
+
+    module::event("user_add_form_admin", $user);
     return $form;
   }
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index b469f82d..542b8b8b 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -66,7 +66,7 @@
       <? foreach ($users as $i => $user): ?>
       <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("gOddRow", "gEvenRow") ?> user <?= $user->admin ? "admin" : "" ?>">
         <td id="user-<?= $user->id ?>" class="core-info gDraggable">
-          <img src="<?= $user->avatar_url(20, $theme->theme_url("images/avatar.jpg", true)) ?>"
+          <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member") ?>"
                alt="<?= p::clean($user->name) ?>"
                width="20"