aboutsummaryrefslogtreecommitdiff
path: root/actions/upload.php
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2009-06-14 20:37:08 +0000
committerCash Costello <cash.costello@gmail.com>2009-06-14 20:37:08 +0000
commit2932918effa51f9689cabe38b758e44435d08e96 (patch)
treeb3bfd26c62ea1350188dfc622b520eac482e6fdb /actions/upload.php
parent8f5aa6a87b15ecee226f46539b1400710c9c9047 (diff)
downloadelgg-2932918effa51f9689cabe38b758e44435d08e96.tar.gz
elgg-2932918effa51f9689cabe38b758e44435d08e96.tar.bz2
close to final version of river entries - commented out cover from image view and added option for album to show multiple photos
Diffstat (limited to 'actions/upload.php')
-rw-r--r--actions/upload.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/actions/upload.php b/actions/upload.php
index e7c78c178..2e33d67db 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -55,7 +55,7 @@
$not_uploaded = array();
$error_msgs = array();
- $river_view = get_plugin_setting('river_view', 'tidypics');
+ $img_river_view = get_plugin_setting('img_river_view', 'tidypics');
$accepted_formats = array(
'image/jpeg',
@@ -197,7 +197,7 @@
// update user/group size for checking quota
$image_repo_size += $sent_file['size'];
- if($river_view == "all") {
+ if($img_river_view == "all") {
add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
}
unset($file); // may not be needed but there seems to be a memory leak
@@ -232,7 +232,7 @@
$album->new_album = TP_OLD_ALBUM;
}
- if(count($uploaded_images) && $river_view == "1") {
+ if(count($uploaded_images) && $img_river_view == "1") {
if (function_exists('add_to_river')) {
add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
}