aboutsummaryrefslogtreecommitdiffstats
path: root/mod/photos.php
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-11-03 10:46:57 +0100
committermarijus <mario@mariovavti.com>2014-11-03 10:46:57 +0100
commit2f85d12a6c6bcaeb5e5197a86863b6915ab93ddb (patch)
treeffa8e4fc1e021c2ed4a3674a9a0d17657ffb10d3 /mod/photos.php
parent0e4f318b71fc454c3a0ce6f0e073d9808ff00269 (diff)
downloadvolse-hubzilla-2f85d12a6c6bcaeb5e5197a86863b6915ab93ddb.tar.gz
volse-hubzilla-2f85d12a6c6bcaeb5e5197a86863b6915ab93ddb.tar.bz2
volse-hubzilla-2f85d12a6c6bcaeb5e5197a86863b6915ab93ddb.zip
if deleting a photo go away to album
Diffstat (limited to 'mod/photos.php')
-rw-r--r--mod/photos.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/photos.php b/mod/photos.php
index 48bc6d1e5..51ac4c25c 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -196,7 +196,7 @@ function photos_post(&$a) {
}
}
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ goaway($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']);
}
if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) {
@@ -918,6 +918,8 @@ function photos_content(&$a) {
$aclselect_e = populate_acl($ph[0]);
$albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer']));
+ $_SESSION['album_return'] = bin2hex($ph[0]['album']);
+
$edit = array(
'edit' => t('Edit photo'),
'id' => $link_item['id'],