Refs #2543: Updated trunk mods and views to use the new functions from previous 2 commits.

git-svn-id: http://code.elgg.org/elgg/trunk@8079 36083f99-b078-4883-b0ff-0f9b5a30f544

4 files changed, 4 insertions, 4 deletions

diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php
index 74ee5ba4b..238777422 100644
--- a/views/default/forms/comments/add.php
+++ b/views/default/forms/comments/add.php
@@ -7,7 +7,7 @@
  * @uses $vars['entity']
  */
 
-if (isset($vars['entity']) && isloggedin()) {
+if (isset($vars['entity']) && elgg_is_logged_in()) {
 ?>
 <p class="mbn">
 	<label><?php echo elgg_echo("generic_comments:text"); ?></label>
diff --git a/views/default/forms/comments/inline.php b/views/default/forms/comments/inline.php
index ee5883435..9c44905be 100644
--- a/views/default/forms/comments/inline.php
+++ b/views/default/forms/comments/inline.php
@@ -5,7 +5,7 @@
  * @uses $vars['entity']
  */
 
-if (isset($vars['entity']) && isloggedin()) {
+if (isset($vars['entity']) && elgg_is_logged_in()) {
 	echo elgg_view('input/text', array('internalname' => 'generic_comment'));
 	echo elgg_view('input/hidden', array(
 		'internalname' => 'entity_guid',
diff --git a/views/default/forms/register.php b/views/default/forms/register.php
index 93e2585d8..b2f4d14f7 100644
--- a/views/default/forms/register.php
+++ b/views/default/forms/register.php
@@ -11,7 +11,7 @@ $email = get_input('e');
 $name = get_input('n');
 
 $admin_option = false;
-if (isadminloggedin() && isset($vars['show_admin'])) {
+if (elgg_is_admin_logged_in() && isset($vars['show_admin'])) {
 	$admin_option = true;
 }
 
diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php
index efb691551..ae0049267 100644
--- a/views/default/forms/useradd.php
+++ b/views/default/forms/useradd.php
@@ -7,7 +7,7 @@
  */
 
 $admin_option = false;
-if ((get_loggedin_user()->isAdmin()) && ($vars['show_admin'])) {
+if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) {
 	$admin_option = true;
 }