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, 12 insertions, 12 deletions

diff --git a/mod/invitefriends/start.php b/mod/invitefriends/start.php
index f2b532253..6bdedcffa 100644
--- a/mod/invitefriends/start.php
+++ b/mod/invitefriends/start.php
@@ -1,25 +1,25 @@
 <?php
 /**
- * Elgg invite page
- * 
- * @package ElggFile
+ * Elgg invite friends
+ *
+ * @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/
  */
 
+/**
+ * Add menu item for invite friends
+ */
 function invitefriends_pagesetup() {
-		
-	// Menu options
 	global $CONFIG;
-	if (get_context() == "friends" || 
-		get_context() == "friendsof") {
+	if (get_context() == "friends" ||
+		get_context() == "friendsof" ||
+		get_context() == "collections") {
 			add_submenu_item(elgg_echo('friends:invite'),$CONFIG->wwwroot."mod/invitefriends/",'invite');
-		}
 	}
+}
 
-	global $CONFIG;
-	register_action('invitefriends/invite', false, $CONFIG->pluginspath . 'invitefriends/actions/invite.php');
-	register_elgg_event_handler('pagesetup','system','invitefriends_pagesetup',1000);
-?>
\ No newline at end of file
+register_action('invitefriends/invite', false, $CONFIG->pluginspath . 'invitefriends/actions/invite.php');
+register_elgg_event_handler('pagesetup', 'system', 'invitefriends_pagesetup');