aboutsummaryrefslogtreecommitdiff
path: root/mod/file/views/default/forms
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-06-26 06:24:46 -0700
committerCash Costello <cash.costello@gmail.com>2011-06-26 06:24:46 -0700
commit33f5c59d5318bc1e9a607215a31e48c6f7ab5b29 (patch)
treef519afd28b7d9c5d03d078c3afd1a3a77c5b45a4 /mod/file/views/default/forms
parentf3240e1da73d4a89e379c0c34f8ce86f460e18dc (diff)
parent9ab2a7f6ea6650fcbbb20f9d0dd207de2d58b286 (diff)
downloadelgg-33f5c59d5318bc1e9a607215a31e48c6f7ab5b29.tar.gz
elgg-33f5c59d5318bc1e9a607215a31e48c6f7ab5b29.tar.bz2
Merge pull request #41 from cash/embed-lightbox
Fixes #3564 Embed rewrite using new lightbox
Diffstat (limited to 'mod/file/views/default/forms')
-rw-r--r--mod/file/views/default/forms/file/upload.php9
1 files changed, 3 insertions, 6 deletions
diff --git a/mod/file/views/default/forms/file/upload.php b/mod/file/views/default/forms/file/upload.php
index b8a7a1668..98b7d9f05 100644
--- a/mod/file/views/default/forms/file/upload.php
+++ b/mod/file/views/default/forms/file/upload.php
@@ -11,8 +11,10 @@ $desc = elgg_extract('description', $vars, '');
$tags = elgg_extract('tags', $vars, '');
$access_id = elgg_extract('access_id', $vars, ACCESS_DEFAULT);
$container_guid = elgg_extract('container_guid', $vars);
+if (!$container_guid) {
+ $container_guid = elgg_get_logged_in_user_guid();
+}
$guid = elgg_extract('guid', $vars, null);
-$ajax = elgg_extract('ajax', $vars, FALSE);
if ($guid) {
$file_label = elgg_echo("file:replace");
@@ -56,11 +58,6 @@ if ($categories) {
echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid));
-//@todo this should not be necessary in 1.8... -- ajax actions can be auto-detected
-if ($ajax) {
- echo elgg_view('input/hidden', array('name' => 'ajax', 'value' => 1));
-}
-
if ($guid) {
echo elgg_view('input/hidden', array('name' => 'file_guid', 'value' => $guid));
}