wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SensitiveContent] Don't crash in GNU social classic

Browse Source 
When an attachment has no thumbnail (for example when it's a video).
This commit is contained in:
nee 2018-04-05 22:16:19 +02:00 committed by Diogo Cordeiro
parent 13e8445083
commit 520a2ba202
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/SensitiveContent/SensitiveContentPlugin.php
View File

@ -160,14 +160,23 @@ EOB;
$classes = "sensitive-blocker"; //'sensitive-blocker'; $classes = "sensitive-blocker"; //'sensitive-blocker';
$thumbnail = null;
try {
$thumbnail = $file->getThumbnail();
} catch (Exception $e) {
$thumbnail = null;
}
$thumb_width_css = $thumbnail ? $thumbnail->width . 'px' : '100%';
$thumb_height_css = $thumbnail ? $thumbnail->height . 'px' : '100%';
$out->elementStart('div', array( $out->elementStart('div', array(
'class'=>'attachment-wrapper', 'class' => 'attachment-wrapper',
'style'=>'height: ' . $file->getThumbnail()->height . 'px; width: ' . $file->getThumbnail()->width . 'px;' 'style' => "height: {$thumb_height_css}; width: {$thumb_width_css};",
)); /*needs height of thumb*/ )); /*needs height of thumb*/
$out->elementStart('div', array( $out->elementStart('div', array(
'class'=>$classes, 'class' => $classes,
'onclick'=>'toggleSpoiler(event)', 'onclick' => 'toggleSpoiler(event)',
'style'=>'height: ' . $file->getThumbnail()->height . 'px; width: ' . $file->getThumbnail()->width . 'px;' 'style' => "height: {$thumb_height_css}; width: {$thumb_width_css};",
)); ));
$out->raw(' '); $out->raw(' ');
$out->elementEnd('div'); $out->elementEnd('div');