diff options
| author | jeroenpraat <jeroenpraat@xs4all.nl> | 2015-12-09 01:39:20 +0100 |
|---|---|---|
| committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2015-12-09 01:39:20 +0100 |
| commit | 60b0f9af909b6f944edd913cb96915cc8c3b7ec3 (patch) | |
| tree | 0df872d85d24118cce12a1a1b0cb1e7bfc4f3adb /mod | |
| parent | 9d04406f9ae8a91f8ec5f3be7f89471ac5605522 (diff) | |
| parent | 29ac533cc908a57115d52a8659bce348b36ae6fa (diff) | |
| download | volse-hubzilla-60b0f9af909b6f944edd913cb96915cc8c3b7ec3.tar.gz volse-hubzilla-60b0f9af909b6f944edd913cb96915cc8c3b7ec3.tar.bz2 volse-hubzilla-60b0f9af909b6f944edd913cb96915cc8c3b7ec3.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/fbrowser.php | 9 | ||||
| -rw-r--r-- | mod/photos.php | 7 |
2 files changed, 3 insertions, 13 deletions
diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 90b554edd..13abbfd8a 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -57,13 +57,8 @@ function fbrowser_content($a){ $types = $ph->supportedTypes(); $ext = $types[$rr['type']]; - if($a->get_template_engine() === 'internal') { - $filename_e = template_escape($rr['filename']); - } - else { - $filename_e = $rr['filename']; - } - + $filename_e = $rr['filename']; + return array( $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['hiq'] . '.' .$ext, $filename_e, diff --git a/mod/photos.php b/mod/photos.php index 5b3367d40..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 |