aboutsummaryrefslogtreecommitdiff
path: root/mod/file/actions
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-10 22:05:49 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-10 22:05:49 +0000
commitadae1958a95d7e801de91d673e927cac348236d9 (patch)
treedeb60ecca44c95abc5301b0d64bcd08585e85798 /mod/file/actions
parentea14bfe87eda3af8e8002c64ad909cf592d7fe76 (diff)
downloadelgg-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/file/actions')
-rw-r--r--mod/file/actions/file/delete.php6
-rw-r--r--mod/file/actions/file/upload.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/mod/file/actions/file/delete.php b/mod/file/actions/file/delete.php
index fe03e5077..622d02277 100644
--- a/mod/file/actions/file/delete.php
+++ b/mod/file/actions/file/delete.php
@@ -10,7 +10,7 @@ $guid = (int) get_input('guid');
$file = new FilePluginFile($guid);
if (!$file->guid) {
register_error(elgg_echo("file:deletefailed"));
- forward('pg/file/all');
+ forward('file/all');
}
if (!$file->canEdit()) {
@@ -27,7 +27,7 @@ if (!$file->delete()) {
}
if (elgg_instanceof($container, 'group')) {
- forward("pg/file/group/$container->guid/owner");
+ forward("file/group/$container->guid/owner");
} else {
- forward("pg/file/owner/$container->username");
+ forward("file/owner/$container->username");
}
diff --git a/mod/file/actions/file/upload.php b/mod/file/actions/file/upload.php
index 2749812d5..4deaabcac 100644
--- a/mod/file/actions/file/upload.php
+++ b/mod/file/actions/file/upload.php
@@ -187,9 +187,9 @@ if ($new_file) {
if (!$ajax) {
$container = get_entity($container_guid);
if (elgg_instanceof($container, 'group')) {
- forward("pg/file/group/$container->guid/owner");
+ forward("file/group/$container->guid/owner");
} else {
- forward("pg/file/owner/$container->username");
+ forward("file/owner/$container->username");
}
}