diff options
| author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-10 22:05:49 +0000 |
|---|---|---|
| committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-10 22:05:49 +0000 |
| commit | adae1958a95d7e801de91d673e927cac348236d9 (patch) | |
| tree | deb60ecca44c95abc5301b0d64bcd08585e85798 /mod/bookmarks/views | |
| parent | ea14bfe87eda3af8e8002c64ad909cf592d7fe76 (diff) | |
| download | elgg-adae1958a95d7e801de91d673e927cac348236d9.tar.gz elgg-adae1958a95d7e801de91d673e927cac348236d9.tar.bz2 | |
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
Diffstat (limited to 'mod/bookmarks/views')
4 files changed, 5 insertions, 5 deletions
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php index 091a15997..1d0b25498 100644 --- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php +++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php @@ -21,7 +21,7 @@ if (!$name && ($user = elgg_get_logged_in_user_entity())) { $url = elgg_get_site_url(); -$bookmarklet = "<a href=\"javascript:location.href='{$url}pg/bookmarks/add/$guid?address='" +$bookmarklet = "<a href=\"javascript:location.href='{$url}bookmarks/add/$guid?address='" . "+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">" . "<img src=\"{$url}mod/bookmarks/graphics/bookmarklet.gif\" alt=\"$title\" /> </a>"; diff --git a/mod/bookmarks/views/default/bookmarks/group_module.php b/mod/bookmarks/views/default/bookmarks/group_module.php index 202f87783..ea1358aeb 100644 --- a/mod/bookmarks/views/default/bookmarks/group_module.php +++ b/mod/bookmarks/views/default/bookmarks/group_module.php @@ -12,7 +12,7 @@ if ($group->bookmarks_enable == "no") { } $all_link = elgg_view('output/url', array( - 'href' => "pg/bookmarks/group/$group->guid/owner", + 'href' => "bookmarks/group/$group->guid/owner", 'text' => elgg_echo('link:view:all'), )); @@ -36,7 +36,7 @@ if (!$content) { } $new_link = elgg_view('output/url', array( - 'href' => "pg/bookmarks/add/$group->guid", + 'href' => "bookmarks/add/$group->guid", 'text' => elgg_echo('bookmarks:add'), )); $content .= "<span class='elgg-widget-more'>$new_link</span>"; diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index 8a4b982e1..9ee564173 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -21,7 +21,7 @@ $link = filter_tags(elgg_view('output/url', array('href' => $bookmark->address)) $description = elgg_view('output/longtext', array('value' => $bookmark->description, 'class' => 'pbl')); $owner_link = elgg_view('output/url', array( - 'href' => "pg/bookmarks/owner/$owner->username", + 'href' => "bookmarks/owner/$owner->username", 'text' => $owner->name, )); $author_text = elgg_echo('byline', array($owner_link)); diff --git a/mod/bookmarks/views/default/widgets/bookmarks/content.php b/mod/bookmarks/views/default/widgets/bookmarks/content.php index 5f9f469d1..ea7816345 100644 --- a/mod/bookmarks/views/default/widgets/bookmarks/content.php +++ b/mod/bookmarks/views/default/widgets/bookmarks/content.php @@ -20,7 +20,7 @@ $content = elgg_list_entities($options); echo $content; if ($content) { - $url = "pg/bookmarks/owner/" . elgg_get_page_owner_entity()->username; + $url = "bookmarks/owner/" . elgg_get_page_owner_entity()->username; $more_link = elgg_view('output/url', array( 'href' => $url, 'text' => elgg_echo('bookmarks:more'), |