merge -r5898:5928 (not excluding riverdashboard, notifications, and messageboard) from 1.7 to trunk.

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

1 files changed, 19 insertions, 20 deletions

diff --git a/mod/invitefriends/index.php b/mod/invitefriends/index.php
index 2a9aee790..1f27f07aa 100644
--- a/mod/invitefriends/index.php
+++ b/mod/invitefriends/index.php
@@ -1,24 +1,23 @@
 <?php
+
 /**
-	 * Elgg invite page
-	 * 
-	 * @package ElggFile
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @link http://elgg.org/
-	 */
+ * Elgg invite page
+ *
+ * @package ElggInviteFriends
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @link http://elgg.org/
+ */
+
+require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
+
+gatekeeper();
+
+set_context('friends');
+set_page_owner(get_loggedin_userid());
 
-	require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
-	
-	gatekeeper();
-	
-	set_context('friends');
-	set_page_owner($_SESSION['guid']);
-	
-	$body = elgg_view('invitefriends/form');
-	$body = elgg_view_layout('one_column_with_sidebar', $body);
+$body = elgg_view('invitefriends/form');
+$body = elgg_view_layout('one_column_with_sidebar', $body);
 
-	page_draw(elgg_echo('friends:invite'),$body);
-	
-?>
\ No newline at end of file
+page_draw(elgg_echo('friends:invite'), $body);