diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-07-14 08:10:28 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-07-14 08:10:28 -0400 |
| commit | 4761adf8eee9feadd77599682ef192b56520d11d (patch) | |
| tree | 022a921d20ddd26fb226351cadedf9a8dfe9e971 /actions/photos/image | |
| parent | 4448f072dc6149a62b602e60e766fd00c2b6af89 (diff) | |
| parent | c1da32e6a7e2f4a15a3b2d69cd38a1c0c164a99d (diff) | |
| download | elgg-4761adf8eee9feadd77599682ef192b56520d11d.tar.gz elgg-4761adf8eee9feadd77599682ef192b56520d11d.tar.bz2 | |
Pulling in several small fixes from Brett's fork
Diffstat (limited to 'actions/photos/image')
| -rw-r--r-- | actions/photos/image/ajax_upload.php | 4 | ||||
| -rw-r--r-- | actions/photos/image/ajax_upload_complete.php | 2 | ||||
| -rw-r--r-- | actions/photos/image/save.php | 2 | ||||
| -rw-r--r-- | actions/photos/image/tag.php | 2 | ||||
| -rw-r--r-- | actions/photos/image/upload.php | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/actions/photos/image/ajax_upload.php b/actions/photos/image/ajax_upload.php index d6b083cf6..312bc598c 100644 --- a/actions/photos/image/ajax_upload.php +++ b/actions/photos/image/ajax_upload.php @@ -22,7 +22,7 @@ if (empty($_FILES)) { exit; } -$file = $_FILES['Image']; +$file = $_FILES[$file_var_name]; $mime = tp_upload_get_mimetype($file['name']); if ($mime == 'unknown') { @@ -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/save.php b/actions/photos/image/save.php index 535ae8bbb..1cb65b1e8 100644 --- a/actions/photos/image/save.php +++ b/actions/photos/image/save.php @@ -16,7 +16,7 @@ $guid = get_input('guid'); elgg_make_sticky_form('tidypics'); if (empty($title)) { - register_error(elgg_echo("album:blank")); + register_error(elgg_echo("image:blank")); forward(REFERER); } diff --git a/actions/photos/image/tag.php b/actions/photos/image/tag.php index 20f476944..e623bd546 100644 --- a/actions/photos/image/tag.php +++ b/actions/photos/image/tag.php @@ -92,7 +92,7 @@ if ($annotation_id) { elgg_echo('tidypics:tag:subject'), sprintf( elgg_echo('tidypics:tag:body'), - $image->title, + $image->getTitle(), $tagger->name, $image->getURL() ) 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 |