diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/addtag.php | 4 | ||||
| -rw-r--r-- | actions/flickrImportPhotoset.php | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/actions/addtag.php b/actions/addtag.php index 115a81bc6..9e5313b7f 100644 --- a/actions/addtag.php +++ b/actions/addtag.php @@ -78,9 +78,7 @@ if ($image->annotate('phototag', serialize($tag), $access_id, $owner_id)) { add_entity_relationship($user_id, 'phototag', $image_guid); // also add this to the river - subject is image, object is the tagged user - if (function_exists('add_to_river')) { - add_to_river('river/object/image/tag', 'tag', $image_guid, $user_id, $access_id); - } + add_to_river('river/object/image/tag', 'tag', $image_guid, $user_id, $access_id); // notify user of tagging as long as not self if ($owner_id != $user_id) { diff --git a/actions/flickrImportPhotoset.php b/actions/flickrImportPhotoset.php index fd6769e3a..eeb42d622 100644 --- a/actions/flickrImportPhotoset.php +++ b/actions/flickrImportPhotoset.php @@ -288,8 +288,7 @@ foreach( $photos_to_upload as $name => $photo ) { // is at least a few photos in it object_notifications('create', 'object', $album); - if (function_exists('add_to_river')) - add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid); + add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid); } if ($img_river_view == "all") { @@ -336,4 +335,3 @@ trigger_elgg_event('upload', 'tp_album', $album); $url = $CONFIG->wwwroot . 'mod/tidypics/pages/edit_multiple.php?files=' . implode('-', $uploaded_images); forward($url); - |