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

Conflicts:
	themes/default/js/ui.init.js

2 files changed, 6 insertions, 4 deletions

diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 69042aed..8de2d248 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -19,8 +19,10 @@
  */
 class user_theme_Core {
   static function header_top($theme) {
-    $view = new View("login.html");
-    $view->user = user::active();
-    return $view->render();
+    if ($theme->page_type != "login") {
+      $view = new View("login.html");
+      $view->user = user::active();
+      return $view->render();
+    }
   }
 }
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 542b8b8b..9bd4c068 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -28,7 +28,7 @@
           {},
           function(data) {
             $("#group-" + group_id).html(data);
-            $("#group-" + group_id + " .gDialogLink").bind("click", handleDialogEvent);
+            $("#group-" + group_id + " .gDialogLink").gallery_dialog();
           });
   }