From a4a8fe024a3160509bdf41d095531d5647f98c51 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 18:54:18 +0000 Subject: moved river create new album event to first upload so people don't see the new album in activity before any photos have been uploaded --- actions/upload.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'actions/upload.php') diff --git a/actions/upload.php b/actions/upload.php index 896cce8e7..b506cde5b 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -131,11 +131,19 @@ foreach($not_uploaded as $im_name){ $error .= ' [' . $im_name . '] '; } - $error .= ' ' . elgg_echo("image:notimage"); + $error .= ' ' . elgg_echo("image:notimage"); register_error($error); } //end of upload check if (count($uploaded_images)>0) { + // successful upload so check if this is a new album and throw river event if so + $album = get_entity($container_guid); + if ($album->new_album == 1) { + if (function_exists('add_to_river')) + add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid); + $album->new_album = 0; + } + forward($CONFIG->wwwroot . 'mod/tidypics/edit_multi.php?files=' . implode('-', $uploaded_images)); //forward to multi-image edit page } else { forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page -- cgit v1.2.3