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

4 files changed, 7 insertions, 7 deletions

diff --git a/views/default/page/default.php b/views/default/page/default.php
index a7190c90e..6604b047c 100644
--- a/views/default/page/default.php
+++ b/views/default/page/default.php
@@ -12,9 +12,9 @@
  */
 
 // backward compatability support for plugins that are not using the new approach
-// of routing through pg/admin. See reportedcontent plugin for a simple example.
+// of routing through admin. See reportedcontent plugin for a simple example.
 if (elgg_get_context() == 'admin') {
-	elgg_deprecated_notice("admin plugins should route through pg/admin.", 1.8);
+	elgg_deprecated_notice("admin plugins should route through 'admin'.", 1.8);
 	elgg_admin_add_plugin_settings_menu();
 	elgg_unregister_css('elgg');
 	echo elgg_view('page/shells/admin', $vars);
diff --git a/views/default/page/layouts/content/filter.php b/views/default/page/layouts/content/filter.php
index 0af293e24..701c6418a 100644
--- a/views/default/page/layouts/content/filter.php
+++ b/views/default/page/layouts/content/filter.php
@@ -24,19 +24,19 @@ if (elgg_is_logged_in() && $context) {
 	$tabs = array(
 		'all' => array(
 			'text' => elgg_echo('all'),
-			'href' => (isset($vars['all_link'])) ? $vars['all_link'] : "pg/$context/all/",
+			'href' => (isset($vars['all_link'])) ? $vars['all_link'] : "$context/all",
 			'selected' => ($filter_context == 'all'),
 			'priority' => 200,
 		),
 		'mine' => array(
 			'text' => elgg_echo('mine'),
-			'href' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$context/owner/$username/",
+			'href' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "$context/owner/$username",
 			'selected' => ($filter_context == 'mine'),
 			'priority' => 300,
 		),
 		'friend' => array(
 			'text' => elgg_echo('friends'),
-			'href' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$context/friends/$username/",
+			'href' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "$context/friends/$username",
 			'selected' => ($filter_context == 'friends'),
 			'priority' => 400,
 		),
diff --git a/views/default/page/layouts/content/header.php b/views/default/page/layouts/content/header.php
index 830c33885..e9c099b70 100644
--- a/views/default/page/layouts/content/header.php
+++ b/views/default/page/layouts/content/header.php
@@ -35,7 +35,7 @@ if ($context) {
 			
 			elgg_register_menu_item('title', array(
 				'name' => 'add',
-				'href' => elgg_extract('new_link', $vars, "pg/$context/add/$guid"),
+				'href' => elgg_extract('new_link', $vars, "$context/add/$guid"),
 				'text' => elgg_echo("$context:add"),
 				'class' => 'elgg-button elgg-button-action',
 			));
diff --git a/views/default/page/layouts/two_column_left_sidebar.php b/views/default/page/layouts/two_column_left_sidebar.php
index 97f4d2719..e395a5053 100644
--- a/views/default/page/layouts/two_column_left_sidebar.php
+++ b/views/default/page/layouts/two_column_left_sidebar.php
@@ -17,7 +17,7 @@ unset($vars['area2']);
 unset($vars['area3']);
 
 // backward compatability support for plugins that are not using the new approach
-// of routing through pg/admin
+// of routing through 'admin'
 if (elgg_get_context() == 'admin') {
 	echo elgg_view('page/layouts/admin', $vars);
 	return true;