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

2 files changed, 5 insertions, 5 deletions

diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index 1c8914ffe..4b5a3ba48 100644
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -112,7 +112,7 @@ if ($can_activate) {
 $categories_html = '';
 if ($categories) {
 	$categories_arr = array();
-	$base_url = elgg_get_site_url() . "pg/admin/plugins?category=";
+	$base_url = elgg_get_site_url() . "admin/plugins?category=";
 
 	foreach ($categories as $category) {
 		$url = $base_url . urlencode($category);
@@ -129,8 +129,8 @@ if ($screenshots) {
 	foreach ($screenshots as $screenshot) {
 		$desc = elgg_echo($screenshot['description']);
 		$alt = htmlentities($desc, ENT_QUOTES, 'UTF-8');
-		$screenshot_full = "{$vars['url']}pg/admin_plugin_screenshot/{$plugin->getID()}/full/{$screenshot['path']}";
-		$screenshot_src = "{$vars['url']}pg/admin_plugin_screenshot/{$plugin->getID()}/thumbnail/{$screenshot['path']}";
+		$screenshot_full = "{$vars['url']}admin_plugin_screenshot/{$plugin->getID()}/full/{$screenshot['path']}";
+		$screenshot_src = "{$vars['url']}admin_plugin_screenshot/{$plugin->getID()}/thumbnail/{$screenshot['path']}";
 
 		$screenshots_html .= "<li class=\"elgg-plugin-screenshot prm ptm\"><a href=\"$screenshot_full\">"
 							. "<img src=\"$screenshot_src\" alt=\"$alt\"></a></li>";
@@ -166,7 +166,7 @@ $license = elgg_view('output/text', array('value' => $plugin->manifest->getLicen
 <?php
 $settings_view = 'settings/' . $plugin->getID() . '/edit';
 if (elgg_view_exists($settings_view)) {
-	$link = elgg_get_site_url() . "pg/admin/plugin_settings/" . $plugin->getID();
+	$link = elgg_get_site_url() . "admin/plugin_settings/" . $plugin->getID();
 	$settings_link = "<a class='plugin_settings small link' href='$link'>[" . elgg_echo('settings') . "]</a>";
 }
 ?>
diff --git a/views/default/object/plugin/simple.php b/views/default/object/plugin/simple.php
index 49ef58313..0361666ff 100644
--- a/views/default/object/plugin/simple.php
+++ b/views/default/object/plugin/simple.php
@@ -43,7 +43,7 @@ if ($website) {
 }
 
 if (elgg_view_exists("settings/$plugin_id/edit")) {
-	$settings_href = elgg_get_site_url() . "pg/admin/plugin_settings/$plugin_id";
+	$settings_href = elgg_get_site_url() . "admin/plugin_settings/$plugin_id";
 	$plugin_footer .= "<li><a class='plugin_settings link' href='$settings_href'>" . elgg_echo('settings') . "</a></li>";
 }