aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/addtag.php4
-rw-r--r--actions/flickrImportPhotoset.php4
-rw-r--r--start.php11
3 files changed, 5 insertions, 14 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);
-
diff --git a/start.php b/start.php
index baaf33f2b..8589be9fb 100644
--- a/start.php
+++ b/start.php
@@ -56,20 +56,15 @@ function tidypics_init() {
register_entity_type('object','image');
register_entity_type('object','album');
- if (function_exists('add_group_tool_option')) {
- add_group_tool_option('photos', elgg_echo('tidypics:enablephotos'), true);
- }
+ add_group_tool_option('photos', elgg_echo('tidypics:enablephotos'), true);
if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled") {
register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override');
}
// Register for notifications
- if (is_callable('register_notification_object')) {
- register_notification_object('object', 'album', elgg_echo('tidypics:newalbum'));
-
- register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message');
- }
+ register_notification_object('object', 'album', elgg_echo('tidypics:newalbum'));
+ register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message');
// slideshow plugin hook
register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');