Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 8 insertions, 6 deletions

diff --git a/mod/notifications/index.php b/mod/notifications/index.php
index b54677681..882389fde 100644
--- a/mod/notifications/index.php
+++ b/mod/notifications/index.php
@@ -12,11 +12,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
 gatekeeper();
 
 elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
-$user = elgg_get_page_owner_guid();
-
-$js_url = elgg_get_simplecache_url('js', 'friendsPickerv1');
-elgg_register_js('friendsPickerv1', $js_url);
-elgg_load_js('friendsPickerv1');
+$user = elgg_get_page_owner_entity();
 
 // Set the context to settings
 elgg_set_context('settings');
@@ -28,7 +24,13 @@ elgg_push_breadcrumb($title);
 
 // Get the form
 $people = array();
-if ($people_ents = elgg_get_entities_from_relationship(array('relationship' => 'notify', 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'user', 'limit' => 99999))) {
+if ($people_ents = elgg_get_entities_from_relationship(array(
+		'relationship' => 'notify',
+		'relationship_guid' => elgg_get_logged_in_user_guid(),
+		'types' => 'user',
+		'limit' => 99999,
+	))) {
+	
 	foreach($people_ents as $ent) {
 		$people[] = $ent->guid;
 	}