diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-01-10 11:39:02 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-01-10 11:39:02 +0100 |
| commit | 46cc360e4e099d0ef91e06833525796f42f1343b (patch) | |
| tree | fbaa017fae198441d1b5d2d70ca6eff7aed3535f | |
| parent | d6ff8dc9b67b8bc80e6f5f4f1bc35c14a284ebd2 (diff) | |
| parent | 3ce79dd6e12c6eb7602649c93798883a2bef1e86 (diff) | |
| download | volse-hubzilla-46cc360e4e099d0ef91e06833525796f42f1343b.tar.gz volse-hubzilla-46cc360e4e099d0ef91e06833525796f42f1343b.tar.bz2 volse-hubzilla-46cc360e4e099d0ef91e06833525796f42f1343b.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Lib/Img_filesize.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Thumbs/Video.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Widget/Forums.php | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Img_filesize.php b/Zotlabs/Lib/Img_filesize.php index e7bef37e1..196697733 100644 --- a/Zotlabs/Lib/Img_filesize.php +++ b/Zotlabs/Lib/Img_filesize.php @@ -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; }
\ No newline at end of file diff --git a/Zotlabs/Thumbs/Video.php b/Zotlabs/Thumbs/Video.php index 05127355e..ff4d10a36 100644 --- a/Zotlabs/Thumbs/Video.php +++ b/Zotlabs/Thumbs/Video.php @@ -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)) { diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php index 91b987746..0b90b9740 100644 --- a/Zotlabs/Widget/Forums.php +++ b/Zotlabs/Widget/Forums.php @@ -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 = ''; |