diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-14 18:55:43 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-14 18:55:43 +0100 |
| commit | 3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af (patch) | |
| tree | 84b87fb47a27035afd2a354d11c36e8259f4c18e /mod/fbrowser.php | |
| parent | 565126a888d70dce853a2351b698bbc0695f0ba9 (diff) | |
| parent | dcf7946673fd57325fc848df8f8cea7a84cc35b6 (diff) | |
| download | volse-hubzilla-3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af.tar.gz volse-hubzilla-3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af.tar.bz2 volse-hubzilla-3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/fbrowser.php')
| -rw-r--r-- | mod/fbrowser.php | 9 |
1 files changed, 2 insertions, 7 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, |