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

8 files changed, 11 insertions, 11 deletions

diff --git a/mod/thewire/actions/add.php b/mod/thewire/actions/add.php
index 181ac55aa..04aa2bc82 100644
--- a/mod/thewire/actions/add.php
+++ b/mod/thewire/actions/add.php
@@ -7,7 +7,7 @@
  */
 
 // Make sure we're logged in (send us to the front page if not)
-if (!isloggedin()) forward();
+if (!elgg_is_logged_in()) forward();
 
 // Get input data
 $body = get_input('new_post_textarea');
diff --git a/mod/thewire/actions/delete.php b/mod/thewire/actions/delete.php
index 9b6bf4a99..849433e0f 100644
--- a/mod/thewire/actions/delete.php
+++ b/mod/thewire/actions/delete.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Make sure we're logged in (send us to the front page if not)
-		if (!isloggedin()) forward();
+		if (!elgg_is_logged_in()) forward();
 
 	// Get input data
 		$guid = (int) get_input('thewirepost');
diff --git a/mod/thewire/add.php b/mod/thewire/add.php
index 64afe1d7c..a63a10190 100644
--- a/mod/thewire/add.php
+++ b/mod/thewire/add.php
@@ -11,7 +11,7 @@
 		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 		
 	// If we're not logged in, forward to the front page
-		if (!isloggedin()) forward(); 
+		if (!elgg_is_logged_in()) forward(); 
 		
 	// choose the required canvas layout and items to display
 	    $area2 = elgg_view_title(elgg_echo('thewire:add'));
diff --git a/mod/thewire/everyone.php b/mod/thewire/everyone.php
index 7a4b5c93d..05793ed03 100644
--- a/mod/thewire/everyone.php
+++ b/mod/thewire/everyone.php
@@ -12,7 +12,7 @@
 		$area2 = elgg_view_title(elgg_echo("thewire:everyone"));
 		
 		//add form
-		if (isloggedin()) {
+		if (elgg_is_logged_in()) {
 			$area2 .= elgg_view("thewire/forms/add");
 		}
 		$offset = (int)get_input('offset', 0);
diff --git a/mod/thewire/index.php b/mod/thewire/index.php
index d69cbd5ca..7ed43e3bc 100644
--- a/mod/thewire/index.php
+++ b/mod/thewire/index.php
@@ -12,12 +12,12 @@
 	// Get the current page's owner
 		$page_owner = elgg_get_page_owner_entity();
 		if ($page_owner === false || is_null($page_owner)) {
-			$page_owner = get_loggedin_user();
+			$page_owner = elgg_get_logged_in_user_entity();
 			set_page_owner($page_owner->getGUID());
 		}
 
 	// title
-		if (elgg_get_page_owner_guid() == get_loggedin_userid()) {
+		if (elgg_get_page_owner_guid() == elgg_get_logged_in_user_guid()) {
 			$area2 = elgg_view_title(elgg_echo("thewire:read"));
 		} else {
 			$area2 = elgg_view_title(elgg_echo("thewire:user",array($page_owner->name)));
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 1c984d792..fea2cf460 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -101,8 +101,8 @@ function rest_wire_post($username, $text) {
 
 			//add submenu options
 				if (elgg_get_context() == "thewire") {
-					if ((elgg_get_page_owner_guid() == get_loggedin_userid() || !elgg_get_page_owner_guid()) && isloggedin()) {
-						add_submenu_item(elgg_echo('thewire:read'),"{$base_url}pg/thewire/" . get_loggedin_user()->username);
+					if ((elgg_get_page_owner_guid() == elgg_get_logged_in_user_guid() || !elgg_get_page_owner_guid()) && elgg_is_logged_in()) {
+						add_submenu_item(elgg_echo('thewire:read'),"{$base_url}pg/thewire/" . elgg_get_logged_in_user_entity()->username);
 						add_submenu_item(elgg_echo('thewire:everyone'),"{$base_url}mod/thewire/everyone.php");
 					} 
 				}
@@ -191,7 +191,7 @@ function rest_wire_post($username, $text) {
 			$thewire->subtype = "thewire";
 			
 			// Set its owner to the current user
-			$thewire->owner_guid = get_loggedin_userid();
+			$thewire->owner_guid = elgg_get_logged_in_user_guid();
 			
 			// For now, set its access to public (we'll add an access dropdown shortly)
 			$thewire->access_id = $access_id;
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index b2a8b65c9..09568a47f 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -28,7 +28,7 @@ if (isset($vars['entity'])) {
 
 		<div class="wire_post_options">
 		<?php
-			if(isloggedin()){
+			if(elgg_is_logged_in()){
 		?>
 			<a href="<?php echo elgg_get_site_url(); ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="elgg-action-button reply small"><?php echo elgg_echo('thewire:reply'); ?></a>
 			<?php
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index ec1980abc..401401171 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -24,7 +24,7 @@ if ($latest_wire) {
 
 	echo "<div class='wire_post'><div class='wire_post_contents clearfix radius8'>";
 	echo $content;
-	if ($owner == get_loggedin_userid()) {
+	if ($owner == elgg_get_logged_in_user_guid()) {
 		$text = elgg_echo('thewire:update');
 		echo "<a class='elgg-action-button update small' href=\"{$url_to_wire}\">$text</a>";
 	}