diff options
author | Brett Profitt <brett.profitt@gmail.com> | 2011-06-18 19:56:33 -0400 |
---|---|---|
committer | Brett Profitt <brett.profitt@gmail.com> | 2011-06-18 19:56:33 -0400 |
commit | ec7b94a64aef23b85866ecdac8e8acc712d29bb6 (patch) | |
tree | a108205c3fa0b694d8ce0ebaafd259480d6b530a /mod/file/actions | |
parent | c80ba5aa03264dd64c20ed8ae222e87f9371a44d (diff) | |
parent | 2b68a4d217c35a5587c462620789493cf2804ba2 (diff) | |
download | elgg-ec7b94a64aef23b85866ecdac8e8acc712d29bb6.tar.gz elgg-ec7b94a64aef23b85866ecdac8e8acc712d29bb6.tar.bz2 |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'mod/file/actions')
-rw-r--r-- | mod/file/actions/file/delete.php | 2 | ||||
-rw-r--r-- | mod/file/actions/file/upload.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/file/actions/file/delete.php b/mod/file/actions/file/delete.php index 622d02277..72585aa36 100644 --- a/mod/file/actions/file/delete.php +++ b/mod/file/actions/file/delete.php @@ -27,7 +27,7 @@ if (!$file->delete()) { } if (elgg_instanceof($container, 'group')) { - forward("file/group/$container->guid/owner"); + forward("file/group/$container->guid/all"); } else { forward("file/owner/$container->username"); } diff --git a/mod/file/actions/file/upload.php b/mod/file/actions/file/upload.php index e04203f67..5d5c28bee 100644 --- a/mod/file/actions/file/upload.php +++ b/mod/file/actions/file/upload.php @@ -192,7 +192,7 @@ if ($new_file) { if (!$ajax) { $container = get_entity($container_guid); if (elgg_instanceof($container, 'group')) { - forward("file/group/$container->guid/owner"); + forward("file/group/$container->guid/all"); } else { forward("file/owner/$container->username"); } |