Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

6 files changed, 17 insertions, 16 deletions

diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index d64c00c8e..45fb94e83 100644
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -12,7 +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();
+$user = elgg_get_page_owner_entity();
 
 // Set the context to settings
 elgg_set_context('settings');
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;
 	}
diff --git a/mod/notifications/languages/en.php b/mod/notifications/languages/en.php
index 586d66892..b29c9df25 100644
--- a/mod/notifications/languages/en.php
+++ b/mod/notifications/languages/en.php
@@ -13,7 +13,6 @@ $english = array(
 
 	'notifications:subscriptions:changesettings' => 'Notifications',
 	'notifications:subscriptions:changesettings:groups' => 'Group notifications',
-	'notification:method:email' => 'Email',	
 
 	'notifications:subscriptions:title' => 'Notifications per user',
 	'notifications:subscriptions:description' => 'To receive notifications from your friends (on an individual basis) when they create new content, find them below and select the notification method you would like to use.',
diff --git a/mod/notifications/manifest.xml b/mod/notifications/manifest.xml
index 16a67cb00..205476881 100644
--- a/mod/notifications/manifest.xml
+++ b/mod/notifications/manifest.xml
@@ -7,11 +7,10 @@
 	<description>Elgg notifications plugin</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/notifications/start.php b/mod/notifications/start.php
index c6701cc3e..761f17e40 100644
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -36,6 +36,7 @@ function notifications_plugin_init() {
  * Route page requests
  *
  * @param array $page Array of url parameters
+ * @return bool
  */
 function notifications_page_handler($page) {
 
@@ -51,12 +52,12 @@ function notifications_page_handler($page) {
 			require "$base/groups.php";
 			break;
 		case 'personal':
-		default:
 			require "$base/index.php";
 			break;
+		default:
+			return false;
 	}
-
-	return TRUE;
+	return true;
 }
 
 /**
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index 106eadc54..e89ce02be 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -234,7 +234,7 @@ END;
 	<td class="namefield">
 		<a href="<?php echo $friend->getURL(); ?>">
 <?php
-			echo elgg_view_entity_icon($friend, 'tiny', array('override' => true));
+			echo elgg_view_entity_icon($friend, 'tiny', array('use_hover' => false));
 ?>
 		</a>
 		<p class="namefieldlink">