From 08d3f7f2820ed971ce5171c9ce9e15dbf452cf3f Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 5 Apr 2010 16:51:32 +0000
Subject: Merged 5605:5622 from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5623 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/account/forms/register.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'views/default/account/forms')

diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index b46e9df0b..580922eb7 100644
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -13,7 +13,9 @@ $email = get_input('e');
 $name = get_input('n');
 
 $admin_option = false;
-if (($_SESSION['user']->isAdmin()) && ($vars['show_admin'])) {
+$loggedin_user = get_loggedin_user();
+
+if ($loggedin_user && $loggedin_user->isAdmin() && isset($vars['show_admin'])) {
 	$admin_option = true;
 }
 
@@ -47,4 +49,4 @@ $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value
 </div>
 <script type="text/javascript">
 	$(document).ready(function() { $('input[name=name]').focus(); });
-</script>
\ No newline at end of file
+</script>
-- 
cgit v1.2.3