diff options
Diffstat (limited to 'pages/upload.php')
| -rw-r--r-- | pages/upload.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pages/upload.php b/pages/upload.php index 8e15dd612..b6a828cf9 100644 --- a/pages/upload.php +++ b/pages/upload.php @@ -9,11 +9,13 @@ include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"; // must be logged in to upload images gatekeeper(); -$album_guid = (int) get_input('container_guid'); +$album_guid = (int) get_input('album_guid'); if (!$album_guid) { forward(); } +$uploader = get_input('uploader', 'ajax'); + $album = get_entity($album_guid); //if album does not exist or user does not have access @@ -22,9 +24,8 @@ if (!$album || !$album->canEdit()) { forward($_SERVER['HTTP_REFERER']); } -// set page owner based on container (user or group) -$container = $album->container_guid; -set_page_owner($container); +// set page owner based on container (user or group) +set_page_owner($album->container_guid); $page_owner = page_owner_entity(); if ($page_owner instanceof ElggGroup) { @@ -36,8 +37,11 @@ set_context('photos'); $title = elgg_echo('album:addpix') . ': ' . $album->title; $area2 .= elgg_view_title($title); -$area2 .= elgg_view("tidypics/forms/upload", array('album' => $album_guid ) ); -//$area2 .= elgg_view("tidypics/forms/ajax_upload", array('album' => $album_guid ) ); +if ($uploader == 'basic') { + $area2 .= elgg_view("tidypics/forms/upload", array('album' => $album)); +} else { + $area2 .= elgg_view("tidypics/forms/ajax_upload", array('album' => $album)); +} $body = elgg_view_layout('two_column_left_sidebar', '', $area2); |