aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/photos/image/ajax_upload.php2
-rw-r--r--actions/photos/image/ajax_upload_complete.php2
-rw-r--r--actions/photos/image/upload.php4
-rw-r--r--lib/exif.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/actions/photos/image/ajax_upload.php b/actions/photos/image/ajax_upload.php
index daa824c42..312bc598c 100644
--- a/actions/photos/image/ajax_upload.php
+++ b/actions/photos/image/ajax_upload.php
@@ -44,7 +44,7 @@ try {
$album->prependImageList(array($image->guid));
if (elgg_get_plugin_setting('img_river_view', 'tidypics') === "all") {
- add_to_river('river/object/image/create', 'create', $image->getObjectOwnerGUID(), $image->getGUID());
+ add_to_river('river/object/image/create', 'create', $image->getOwnerGUID(), $image->getGUID());
}
echo elgg_echo('success');
diff --git a/actions/photos/image/ajax_upload_complete.php b/actions/photos/image/ajax_upload_complete.php
index 6d398b3aa..358a4fc6f 100644
--- a/actions/photos/image/ajax_upload_complete.php
+++ b/actions/photos/image/ajax_upload_complete.php
@@ -41,7 +41,7 @@ if ($images) {
// "added images to album" river
if ($img_river_view == "batch" && $album->new_album == false) {
- add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID());
+ add_to_river('river/object/tidypics_batch/create', 'create', $batch->getOwnerGUID(), $batch->getGUID());
}
// "created album" river
diff --git a/actions/photos/image/upload.php b/actions/photos/image/upload.php
index b917a1598..cb0a2f90d 100644
--- a/actions/photos/image/upload.php
+++ b/actions/photos/image/upload.php
@@ -68,7 +68,7 @@ foreach ($_FILES['images']['name'] as $index => $value) {
array_push($uploaded_images, $image->getGUID());
if ($img_river_view == "all") {
- add_to_river('river/object/image/create', 'create', $image->getObjectOwnerGUID(), $image->getGUID());
+ add_to_river('river/object/image/create', 'create', $image->getOwnerGUID(), $image->getGUID());
}
}
}
@@ -89,7 +89,7 @@ if (count($uploaded_images)) {
// "added images to album" river
if ($img_river_view == "batch" && $album->new_album == false) {
- add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID());
+ add_to_river('river/object/tidypics_batch/create', 'create', $batch->getOwnerGUID(), $batch->getGUID());
}
// "created album" river
diff --git a/lib/exif.php b/lib/exif.php
index 55612a433..43a640336 100644
--- a/lib/exif.php
+++ b/lib/exif.php
@@ -24,7 +24,7 @@ function td_get_exif($file) {
$filename = $file->getFilenameOnFilestore();
$exif = exif_read_data($filename);
- create_metadata($file->getGUID(), "tp_exif", serialize($exif), "text", $file->getObjectOwnerGUID(), ACCESS_PUBLIC);
+ create_metadata($file->getGUID(), "tp_exif", serialize($exif), "text", $file->getOwnerGUID(), ACCESS_PUBLIC);
}
/**