1 files changed, 29 insertions, 16 deletions

diff --git a/mod/notifications/index.php b/mod/notifications/index.php
index c162c34b3..a99622efd 100644
--- a/mod/notifications/index.php
+++ b/mod/notifications/index.php
@@ -1,37 +1,50 @@
 <?php
-
 /**
  * Elgg notifications plugin index
  *
  * @package ElggNotifications
+ *
+ * @uses $user ElggUser
  */
 
-// Load Elgg framework
-require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
-
-// Ensure only logged-in users can see this page
-gatekeeper();
-
-set_page_owner(get_loggedin_userid());
+if (!isset($user) || !($user instanceof ElggUser)) {
+	$url = 'notifications/personal/' . elgg_get_logged_in_user_entity()->username;
+	forward($url);
+}
 
-$js_url = elgg_view_get_simplecache_url('js', 'friendsPickerv1');
-elgg_register_js($js_url, 'friendsPicker');
+elgg_set_page_owner_guid($user->guid);
 
 // Set the context to settings
 elgg_set_context('settings');
 
+$title = elgg_echo('notifications:subscriptions:changesettings');
+
+elgg_push_breadcrumb(elgg_echo('settings'), "settings/user/$user->username");
+elgg_push_breadcrumb($title);
+
 // Get the form
 $people = array();
-if ($people_ents = elgg_get_entities_from_relationship(array('relationship' => 'notify', 'relationship_guid' => get_loggedin_userid(), 'types' => 'user', 'limit' => 99999))) {
+if ($people_ents = elgg_get_entities_from_relationship(array(
+		'relationship' => 'notify',
+		'relationship_guid' => $user->guid,
+		'type' => 'user',
+		'limit' => false,
+	))) {
+	
 	foreach($people_ents as $ent) {
 		$people[] = $ent->guid;
 	}
 }
 
-$body = elgg_view('notifications/subscriptions/form', array('people' => $people));
-
-// Insert it into the correct canvas layout
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $body));
+$body = elgg_view('notifications/subscriptions/form', array(
+	'people' => $people,
+	'user' => $user,
+));
 
+$params = array(
+	'content' => $body,
+	'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', $params);
 
-echo elgg_view_page(elgg_echo('notifications:subscriptions:changesettings'), $body);
+echo elgg_view_page($title, $body);