aboutsummaryrefslogtreecommitdiff
path: root/actions/ajax_upload_complete.php
diff options
context:
space:
mode:
Diffstat (limited to 'actions/ajax_upload_complete.php')
-rw-r--r--actions/ajax_upload_complete.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/actions/ajax_upload_complete.php b/actions/ajax_upload_complete.php
index b66b563e3..2abca50dc 100644
--- a/actions/ajax_upload_complete.php
+++ b/actions/ajax_upload_complete.php
@@ -12,6 +12,12 @@ if (!$album) {
}
if ($album->new_album == TP_NEW_ALBUM) {
+ $new_album = true;
+} else {
+ $new_album = false;
+}
+
+if ($album->new_album == TP_NEW_ALBUM) {
$album->new_album = TP_OLD_ALBUM;
// we throw the notification manually here so users are not told about the new album until there
@@ -38,7 +44,7 @@ if ($images) {
foreach ($images as $image) {
add_entity_relationship($image->guid, "belongs_to_batch", $batch->getGUID());
}
- if (get_plugin_setting('img_river_view', 'tidypics') == "batch") {
+ if (get_plugin_setting('img_river_view', 'tidypics') == "batch" && $new_album == false) {
add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID());
}
}