Upgraded to Elgg 1.8.4.

1 files changed, 12 insertions, 5 deletions

diff --git a/mod/pages/start.php b/mod/pages/start.php
index b2f26c719..834e98870 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -189,10 +189,12 @@ function pages_icon_url_override($hook, $type, $returnvalue, $params) {
 	if (elgg_instanceof($entity, 'object', 'page_top') ||
 		elgg_instanceof($entity, 'object', 'page')) {
 		switch ($params['size']) {
+			case 'topbar':
+			case 'tiny':
 			case 'small':
 				return 'mod/pages/images/pages.gif';
 				break;
-			case 'medium':
+			default:
 				return 'mod/pages/images/pages_lrg.gif';
 				break;
 		}
@@ -264,13 +266,18 @@ function page_notify_message($hook, $entity_type, $returnvalue, $params) {
 	$entity = $params['entity'];
 	$to_entity = $params['to_entity'];
 	$method = $params['method'];
-	if (($entity instanceof ElggEntity) && (($entity->getSubtype() == 'page_top') || ($entity->getSubtype() == 'page'))) {
+
+	if (elgg_instanceof($entity, 'object', 'page') || elgg_instanceof($entity, 'object', 'page_top')) {
 		$descr = $entity->description;
 		$title = $entity->title;
-		//@todo why?
-		$url = elgg_get_site_url() . "view/" . $entity->guid;
 		$owner = $entity->getOwnerEntity();
-		return $owner->name . ' ' . elgg_echo("pages:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
+		
+		return elgg_echo('pages:notification', array(
+			$owner->name,
+			$title,
+			$descr,
+			$entity->getURL()
+		));
 	}
 	return null;
 }