harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2018-01-10 11:39:02 +01:00
commit 46cc360e4e
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zotlabs/Lib/Img_filesize.php
View File

@ -114,8 +114,9 @@ function getRemoteFileSize($url)
return strlen($data);
});
$result = curl_exec($ch);
$info = curl_getinfo($ch);
curl_exec($ch);
curl_getinfo($ch);
curl_close($ch);
return $size;
}

1
Zotlabs/Thumbs/Video.php
View File

@ -49,6 +49,7 @@ class Video {
$cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -thumbnail ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile);
// logger('imagick thumbnail command: ' . $cmd);
/** @scrutinizer ignore-unhandled */
@exec($cmd);
if(! file_exists($outfile)) {

4
Zotlabs/Widget/Forums.php
View File

@ -11,8 +11,8 @@ class Forums {
$o = '';
if(is_array($arr) && array_key_exists('limit',$arr))
$limit = " limit " . intval($limit) . " ";
if(is_array($arr) && array_key_exists('limit',$arr) && intval($arr['limit']) >= 0)
$limit = " limit " . intval($arr['limit']) . " ";
else
$limit = '';