From b763c82ae5c6659089407b9a4c157b2f45f124c0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 6 Nov 2009 14:12:56 -0800
Subject: [PATCH] Display the register link in the user_menu instead of the
 site_menu.  Ticket #871

---
 modules/register/helpers/register_event.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/modules/register/helpers/register_event.php b/modules/register/helpers/register_event.php
index 86dec386..700ba2c2 100755
--- a/modules/register/helpers/register_event.php
+++ b/modules/register/helpers/register_event.php
@@ -23,19 +23,16 @@ class register_event {
       ->id("register_users")
       ->label(t("User registration"))
       ->url(url::site("admin/register")));
-
-    return $menu;
   }
 
-  static function site_menu($menu, $theme) {
-    if (identity::active_user()->guest &&
-        module::get_var("registration", "policy") != "admin_only") {
-      $menu->append( Menu::factory("dialog")
-                 ->id("register_users")
-                 ->label(t("Register"))
-                 ->url(url::site("register")));
+  static function user_menu($menu, $theme) {
+    $user = identity::active_user();
+    if ($theme->page_type != "login" && $user->guest) {
+      $menu->append(Menu::factory("dialog")
+                    ->id("user_menu_register")
+                    ->css_id("g-register-menu")
+                    ->url(url::site("register"))
+                    ->label(t("Register")));
     }
-
-    return $menu;
   }
 }