diff options
| author | royalterra <royalterra@users.noreply.github.com> | 2015-12-11 09:39:01 +0000 |
|---|---|---|
| committer | royalterra <royalterra@users.noreply.github.com> | 2015-12-11 09:39:01 +0000 |
| commit | 4ff31d0a4140d923cbb8ddbe18ccf578a367375f (patch) | |
| tree | 1f63d4b042c3dbf7bfe2c3e74f0a24ef2e5f94ec /mod/photos.php | |
| parent | b92cc852d142940f0f8dd78ddf7be835dc8b9e07 (diff) | |
| parent | f73c82632f213ac7971b54220b4a0c87d354ca1e (diff) | |
| download | volse-hubzilla-4ff31d0a4140d923cbb8ddbe18ccf578a367375f.tar.gz volse-hubzilla-4ff31d0a4140d923cbb8ddbe18ccf578a367375f.tar.bz2 volse-hubzilla-4ff31d0a4140d923cbb8ddbe18ccf578a367375f.zip | |
Merge pull request #1 from redmatrix/master
merge branches
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mod/photos.php b/mod/photos.php index 33a895fdf..b0d9bc631 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -698,12 +698,7 @@ function photos_content(&$a) { $album_edit = null; if(($album !== t('Profile Photos')) && ($album !== 'Profile Photos') && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if($can_post) { - if($a->get_template_engine() === 'internal') { - $album_e = template_escape($album); - } - else { - $album_e = $album; - } + $album_e = $album; $albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer'])); // @fixme - syncronise actions with DAV @@ -765,6 +760,7 @@ function photos_content(&$a) { if($photos) { $o = replace_macros(get_markup_template('photosajax.tpl'),array( '$photos' => $photos, + '$album_id' => bin2hex($album) )); } else { @@ -779,6 +775,7 @@ function photos_content(&$a) { $o .= replace_macros($tpl, array( '$photos' => $photos, '$album' => $album, + '$album_id' => bin2hex($album), '$album_edit' => array(t('Edit Album'), $album_edit), '$can_post' => $can_post, '$upload' => array(t('Upload'), $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album)), @@ -1300,6 +1297,7 @@ function photos_content(&$a) { if($photos) { $o = replace_macros(get_markup_template('photosajax.tpl'),array( '$photos' => $photos, + '$album_id' => bin2hex(t('Recent Photos')) )); } else { @@ -1313,6 +1311,7 @@ function photos_content(&$a) { $tpl = get_markup_template('photos_recent.tpl'); $o .= replace_macros($tpl, array( '$title' => t('Recent Photos'), + '$album_id' => bin2hex(t('Recent Photos')), '$can_post' => $can_post, '$upload' => array(t('Upload'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'), '$photos' => $photos, |