4 files changed, 24 insertions, 16 deletions
diff --git a/mod/invitefriends/actions/invite.php b/mod/invitefriends/actions/invite.php
index 1a8956419..eed156d69 100644
--- a/mod/invitefriends/actions/invite.php
+++ b/mod/invitefriends/actions/invite.php
@@ -47,7 +47,7 @@ foreach ($emails as $email) {
 		continue;
 	}
 
-	$link = elgg_get_site_url() . 'pg/register?friend_guid=' . $current_user->guid . '&invitecode=' . generate_invite_code($current_user->username);
+	$link = elgg_get_site_url() . 'register?friend_guid=' . $current_user->guid . '&invitecode=' . generate_invite_code($current_user->username);
 	$message = elgg_echo('invitefriends:email', array(
 					$site->name,
 					$current_user->name,
@@ -60,7 +60,7 @@ foreach ($emails as $email) {
 
 	// create the from address
 	$site = get_entity($site->guid);
-	if (($site) && (isset($site->email))) {
+	if ($site && $site->email) {
 		$from = $site->email;
 	} else {
 		$from = 'noreply@' . get_site_domain($site->guid);
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index 7e7e0c10b..b36238a05 100644
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -2,14 +2,16 @@
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
 	<name>Invite Friends</name>
 	<author>Core developers</author>
-	<version>1.7</version>
-	<description>Invite friends to Elgg network via email invites.</description>
+	<version>1.8</version>
+	<category>bundled</category>
+	<category>social</category>
+	<description>Invite friends via email invites.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
-	<admin_interface>advanced</admin_interface>
+	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/invitefriends/start.php b/mod/invitefriends/start.php
index e05a2e128..368f6348a 100644
--- a/mod/invitefriends/start.php
+++ b/mod/invitefriends/start.php
@@ -12,25 +12,28 @@ function invitefriends_init() {
 
 	elgg_register_action('invitefriends/invite', elgg_get_plugins_path() . 'invitefriends/actions/invite.php');
 
-	$params = array(
-		'name' => 'invite',
-		'title' => elgg_echo('friends:invite'),
-		'url' => "pg/invite/",
-		'contexts' => array('friends'),
-	);
-	elgg_register_menu_item('page', $params);
+	if (elgg_is_logged_in()) {
+		$params = array(
+			'name' => 'invite',
+			'text' => elgg_echo('friends:invite'),
+			'href' => "invite",
+			'contexts' => array('friends'),
+		);
+		elgg_register_menu_item('page', $params);
+	}
 }
 
 /**
  * Page handler function
  * 
  * @param array $page Page URL segments
+ * @return bool
  */
 function invitefriends_page_handler($page) {
 	gatekeeper();
 
 	elgg_set_context('friends');
-	set_page_owner(elgg_get_logged_in_user_guid());
+	elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
 
 	$title = elgg_echo('friends:invite');
 
@@ -43,4 +46,5 @@ function invitefriends_page_handler($page) {
 	$body = elgg_view_layout('one_sidebar', $params);
 
 	echo elgg_view_page($title, $body);
+	return true;
 }
diff --git a/mod/invitefriends/views/default/forms/invitefriends/invite.php b/mod/invitefriends/views/default/forms/invitefriends/invite.php
index 2597598de..0d7f5d9f2 100644
--- a/mod/invitefriends/views/default/forms/invitefriends/invite.php
+++ b/mod/invitefriends/views/default/forms/invitefriends/invite.php
@@ -27,7 +27,9 @@ if (elgg_get_config('allow_registration')) {
 </div>
 HTML;
 
+	echo '<div class="elgg-foot">';
 	echo elgg_view('input/submit', array('value' => elgg_echo('send')));
+	echo '</div>';
 } else {
 	echo elgg_echo('invitefriends:registration_disabled');
 }