diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-20 15:04:08 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-20 15:04:08 -0800 |
| commit | babe14410c92b2ae6985aebf69d0e755c0fc2045 (patch) | |
| tree | 6ec1053cf706b82c44438982ead9ae360939fd83 /Zotlabs/Storage/Browser.php | |
| parent | 4cd0b745cbc24a035a5e9ba488917ec7beeda888 (diff) | |
| parent | 250d758d74fa1e117ed11c884a0c26040e696494 (diff) | |
| download | volse-hubzilla-babe14410c92b2ae6985aebf69d0e755c0fc2045.tar.gz volse-hubzilla-babe14410c92b2ae6985aebf69d0e755c0fc2045.tar.bz2 volse-hubzilla-babe14410c92b2ae6985aebf69d0e755c0fc2045.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Storage/Browser.php')
| -rw-r--r-- | Zotlabs/Storage/Browser.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 17b07ad82..dd3067cf8 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -208,6 +208,16 @@ class Browser extends DAV\Browser\Plugin { $photo_icon = ''; $preview_style = intval(get_config('system','thumbnail_security',0)); + $r = q("select content from attach where hash = '%s' and uid = %d limit 1", + dbesc($attachHash), + intval($owner) + ); + + if($r && file_exists(dbunescbin($r[0]['content']) . '.thumb')) { + $photo_icon = 'data:image/jpeg;base64,' . base64_encode(file_get_contents(dbunescbin($r[0]['content']) . '.thumb')); +// logger('found thumb: ' . $photo_icon); + } + if(strpos($type,'image/') === 0 && $attachHash) { $r = q("select resource_id, imgscale from photo where resource_id = '%s' and imgscale in ( %d, %d ) order by imgscale asc limit 1", dbesc($attachHash), @@ -220,12 +230,11 @@ class Browser extends DAV\Browser\Plugin { if($type === 'image/svg+xml' && $preview_style > 0) { $photo_icon = $fullPath; } - } $g = [ 'resource_id' => $attachHash, 'thumbnail' => $photo_icon, 'security' => $preview_style ]; call_hooks('file_thumbnail', $g); - $photo_icon = $g['photo_icon']; + $photo_icon = $g['thumbnail']; $attachIcon = ""; // "<a href=\"attach/".$attachHash."\" title=\"".$displayName."\"><i class=\"fa fa-arrow-circle-o-down\"></i></a>"; |