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

5 files changed, 6 insertions, 6 deletions

diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php
index 312c89c0c..14d41f07a 100644
--- a/mod/blog/views/default/blog/group_module.php
+++ b/mod/blog/views/default/blog/group_module.php
@@ -10,7 +10,7 @@ if ($group->blog_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "pg/blog/group/$group->guid/owner",
+	'href' => "blog/group/$group->guid/owner",
 	'text' => elgg_echo('link:view:all'),
 ));
 
@@ -35,7 +35,7 @@ if (!$content) {
 }
 
 $new_link = elgg_view('output/url', array(
-	'href' => "pg/blog/add/$group->guid",
+	'href' => "blog/add/$group->guid",
 	'text' => elgg_echo('blog:write'),
 ));
 $content .= "<span class='elgg-widget-more'>$new_link</span>";
diff --git a/mod/blog/views/default/blog/sidebar/archives.php b/mod/blog/views/default/blog/sidebar/archives.php
index 5eda64afb..3aa3db44f 100644
--- a/mod/blog/views/default/blog/sidebar/archives.php
+++ b/mod/blog/views/default/blog/sidebar/archives.php
@@ -17,7 +17,7 @@ if ($page_owner && $vars['page'] != 'friends') {
 			$timestamplow = mktime(0, 0, 0, substr($date,4,2) , 1, substr($date, 0, 4));
 			$timestamphigh = mktime(0, 0, 0, ((int) substr($date, 4, 2)) + 1, 1, substr($date, 0, 4));
 
-			$link = elgg_get_site_url() . 'pg/blog/archive/' . $page_owner->username . '/' . $timestamplow . '/' . $timestamphigh;
+			$link = elgg_get_site_url() . 'blog/archive/' . $page_owner->username . '/' . $timestamplow . '/' . $timestamphigh;
 			$month = elgg_echo('date:month:' . substr($date, 4, 2), array(substr($date, 0, 4)));
 			$content .= "<li><a href=\"$link\" title=\"$month\">$month</a></li>";
 		}
diff --git a/mod/blog/views/default/blog/sidebar/revisions.php b/mod/blog/views/default/blog/sidebar/revisions.php
index 01eab01c4..e19516f71 100644
--- a/mod/blog/views/default/blog/sidebar/revisions.php
+++ b/mod/blog/views/default/blog/sidebar/revisions.php
@@ -33,7 +33,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 		$n = count($revisions);
 		$body = '<ul class="blog-revisions">';
 
-		$load_base_url = "pg/blog/edit/{$blog->getGUID()}/";
+		$load_base_url = "blog/edit/{$blog->getGUID()}";
 
 		// show the "published revision"
 		if ($blog->status == 'published') {
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 9687e8f34..c5425056e 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -19,7 +19,7 @@ $excerpt = $blog->excerpt;
 
 $owner_icon = elgg_view_entity_icon($owner, 'tiny');
 $owner_link = elgg_view('output/url', array(
-	'href' => "pg/blog/owner/$owner->username",
+	'href' => "blog/owner/$owner->username",
 	'text' => $owner->name,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
diff --git a/mod/blog/views/default/widgets/blog/content.php b/mod/blog/views/default/widgets/blog/content.php
index 713c0f07d..7bbfc3c74 100644
--- a/mod/blog/views/default/widgets/blog/content.php
+++ b/mod/blog/views/default/widgets/blog/content.php
@@ -18,7 +18,7 @@ $content = elgg_list_entities($options);
 echo $content;
 
 if ($content) {
-	$blog_url = "pg/blog/owner/" . elgg_get_page_owner_entity()->username;
+	$blog_url = "blog/owner/" . elgg_get_page_owner_entity()->username;
 	$more_link = elgg_view('output/url', array(
 		'href' => $blog_url,
 		'text' => elgg_echo('blog:moreblogs'),