From be37104ac63cd25f2eac831ca03d6d2b19976e1c Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 22 Aug 2010 21:53:48 +0000 Subject: Merged r6684:6694 from 1.7 branch to trunk (pages plugin was manually merged due to standardization of code in trunk but not branch) git-svn-id: http://code.elgg.org/elgg/trunk@6848 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/pages/start.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mod/pages/start.php') diff --git a/mod/pages/start.php b/mod/pages/start.php index 8f4e3b5e2..6fd0ef26d 100644 --- a/mod/pages/start.php +++ b/mod/pages/start.php @@ -70,9 +70,8 @@ function pages_init() { function pages_url($entity) { global $CONFIG; - - return $CONFIG->url . "pg/pages/view/{$entity->guid}/"; - + $title = elgg_get_friendly_title($entity->title); + return $CONFIG->url . "pg/pages/view/{$entity->guid}/$title"; } /** @@ -207,7 +206,7 @@ function page_notify_message($hook, $entity_type, $returnvalue, $params) { $owner = $entity->getOwnerEntity(); return $owner->name . ' ' . elgg_echo("pages:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); } - if ($method == 'web') { + if ($method == 'site') { $owner = $entity->getOwnerEntity(); return $owner->name . ' ' . elgg_echo("pages:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); } -- cgit v1.2.3