From adae1958a95d7e801de91d673e927cac348236d9 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Thu, 10 Mar 2011 22:05:49 +0000 Subject: Fixes #2228: Major cleanup of urls -- remove leading pg/ and trailing / from most urls in core and plugins git-svn-id: http://code.elgg.org/elgg/trunk@8653 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/thewire/start.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'mod/thewire/start.php') diff --git a/mod/thewire/start.php b/mod/thewire/start.php index a9a576904..1724a33a9 100644 --- a/mod/thewire/start.php +++ b/mod/thewire/start.php @@ -22,7 +22,7 @@ function thewire_init() { } // add a site navigation item - $item = new ElggMenuItem('thewire', elgg_echo('thewire'), 'pg/thewire/all'); + $item = new ElggMenuItem('thewire', elgg_echo('thewire'), 'thewire/all'); elgg_register_menu_item('site', $item); // remove entity menu items edit and access because they don't apply here. @@ -66,19 +66,19 @@ function thewire_init() { * The wire page handler * * Supports: - * pg/thewire/all View site wire posts - * pg/thewire/owner/ View this user's wire posts - * pg/thewire/following/ View the posts of those this user follows - * pg/thewire/reply/ Reply to a post - * pg/thewire/view/ View a conversation thread - * pg/thewire/tag/ View wire posts tagged with + * thewire/all View site wire posts + * thewire/owner/ View this user's wire posts + * thewire/following/ View the posts of those this user follows + * thewire/reply/ Reply to a post + * thewire/view/ View a conversation thread + * thewire/tag/ View wire posts tagged with * * @param array $page From the page_handler function * @return true|false Depending on success */ function thewire_page_handler($page) { - // if just pg/thewire/ go to global view in the else statement + // if just /thewire go to global view in the else statement if (isset($page[0]) && $page[0]) { switch ($page[0]) { @@ -133,7 +133,7 @@ function thewire_page_handler($page) { */ function thewire_url($thewirepost) { global $CONFIG; - return $CONFIG->url . "pg/thewire/view/" . $thewirepost->guid; + return $CONFIG->url . "thewire/view/" . $thewirepost->guid; } /** @@ -163,7 +163,7 @@ function thewire_notify_message($hook, $entity_type, $returnvalue, $params) { $body = sprintf(elgg_echo('thewire:notify:post'), $owner->name); } $body .= "\n\n" . $descr . "\n\n"; - $body .= elgg_echo('thewire') . ": {$CONFIG->url}pg/thewire/"; + $body .= elgg_echo('thewire') . ": {$CONFIG->url}thewire"; return $body; } return $returnvalue; @@ -206,13 +206,13 @@ function thewire_filter($text) { // usernames $text = preg_replace( '/(^|[^\w])@([\w]+)/', - '$1@$2', + '$1@$2', $text); // hashtags $text = preg_replace( '/(^|[^\w])#(\w*[^\s\d!-\/:-@]+\w*)/', - '$1#$2', + '$1#$2', $text); $text = trim($text); -- cgit v1.2.3