Merge pull request #10551 from Elgg/2.2

2.2 to 2.x

mod/groups/actions/groups/membership/join.php

@@ -43,6 +43,8 @@
 		} else {
 			register_error(elgg_echo("groups:cantjoin"));
 		}
+	} elseif (check_entity_relationship($user->guid, 'membership_request', $group->guid)) {
+		register_error(elgg_echo("groups:joinrequest:exists"));
 	} else {
 		add_entity_relationship($user->guid, 'membership_request', $group->guid);
 

mod/groups/languages/en.php

@@ -132,6 +132,7 @@
 	'groups:addedtogroup' => 'Successfully added the user to the group',
 	'groups:joinrequestnotmade' => 'Could not request to join group',
 	'groups:joinrequestmade' => 'Requested to join group',
+	'groups:joinrequest:exists' => 'You already requested membership for this group',
 	'groups:joined' => 'Successfully joined group!',
 	'groups:left' => 'Successfully left group',
 	'groups:notowner' => 'Sorry, you are not the owner of this group.',

mod/likes/actions/likes/add.php

@@ -46,11 +46,21 @@
 
 	$title_str = $entity->getDisplayName();
 	if (!$title_str) {
-		$title_str = elgg_get_excerpt($entity->description);
+		$title_str = elgg_get_excerpt($entity->description, 80);
 	}
 
 	$site = elgg_get_site_entity();
 
+	// summary for site_notifications
+	$summary = elgg_echo('likes:notifications:subject', array(
+			$user->name,
+			$title_str
+		),
+		$owner->language
+	);
+
+	// prevent long subjects in mail
+	$title_str = elgg_get_excerpt($title_str, 80);
 	$subject = elgg_echo('likes:notifications:subject', array(
 			$user->name,
 			$title_str
@@ -77,6 +87,7 @@
 		array(
 			'action' => 'create',
 			'object' => $annotation,
+			'summary' => $summary,
 		)
 	);
 }