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 /actions | |
| 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 'actions')
| -rw-r--r-- | actions/admin/plugins/activate.php | 2 | ||||
| -rw-r--r-- | actions/admin/plugins/deactivate.php | 2 | ||||
| -rw-r--r-- | actions/admin/user/delete.php | 2 | ||||
| -rw-r--r-- | actions/friends/collections/add.php | 4 | ||||
| -rw-r--r-- | actions/friends/collections/delete.php | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/actions/admin/plugins/activate.php b/actions/admin/plugins/activate.php index 5196467b2..ad588f3db 100644 --- a/actions/admin/plugins/activate.php +++ b/actions/admin/plugins/activate.php @@ -38,7 +38,7 @@ elgg_invalidate_simplecache(); elgg_filepath_cache_reset(); if (count($plugin_guids) == 1) { - forward("pg/admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]); + forward("admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]); } else { forward(REFERER); }
\ No newline at end of file diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php index c1dd2d1b5..74c78e0fc 100644 --- a/actions/admin/plugins/deactivate.php +++ b/actions/admin/plugins/deactivate.php @@ -38,7 +38,7 @@ elgg_invalidate_simplecache(); elgg_filepath_cache_reset(); if (count($plugin_guids) == 1) { - forward("pg/admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]); + forward("admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]); } else { forward(REFERER); } diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php index 39a0bc49c..7cfbd0925 100644 --- a/actions/admin/user/delete.php +++ b/actions/admin/user/delete.php @@ -34,7 +34,7 @@ if (($user instanceof ElggUser) && ($user->canEdit())) { // forward to user administration if on a user's page as it no longer exists $forward = REFERER; if (strpos($_SERVER['HTTP_REFERER'], $username) != FALSE) { - $forward = "pg/admin/users/newest"; + $forward = "admin/users/newest"; } forward($forward); diff --git a/actions/friends/collections/add.php b/actions/friends/collections/add.php index eac8bced8..8ec6a085f 100644 --- a/actions/friends/collections/add.php +++ b/actions/friends/collections/add.php @@ -26,11 +26,11 @@ if ($collection_name) { // Success message system_message(elgg_echo("friends:collectionadded")); // Forward to the collections page - forward("pg/collections/" . elgg_get_logged_in_user_entity()->username); + forward("collections/" . elgg_get_logged_in_user_entity()->username); } else { register_error(elgg_echo("friends:nocollectionname")); // Forward to the add collection page - forward("pg/collections/add"); + forward("collections/add"); } diff --git a/actions/friends/collections/delete.php b/actions/friends/collections/delete.php index f0ceaf023..fe719d74b 100644 --- a/actions/friends/collections/delete.php +++ b/actions/friends/collections/delete.php @@ -33,4 +33,4 @@ if ($get_collection) { } // Forward to the collections page -forward("pg/collections/" . elgg_get_logged_in_user_entity()->username); +forward("collections/" . elgg_get_logged_in_user_entity()->username); |