sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7201 from owncloud/fix_error_msg_imagick_queryFormats 

suppress error msg caused by php bug
remotes/origin/ldap_group_count
Thomas Müller 2014-02-14 12:49:52 +07:00
parent afe133d5d1 f62f1658ce
commit 4b603cd2f8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/preview/office.php
Unescape Escape View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
//both, libreoffice backend and php fallback, need imagick
if (extension_loaded('imagick') && count(\Imagick::queryFormats("PDF")) === 1) {
if (extension_loaded('imagick') && count(@\Imagick::queryFormats("PDF")) === 1) {
$isShellExecEnabled = \OC_Helper::is_function_enabled('shell_exec');
// LibreOffice preview is currently not supported on Windows

2
lib/private/preview/pdf.php
Unescape Escape View File

@ -7,7 +7,7 @@
*/
namespace OC\Preview;
if (extension_loaded('imagick') && count(\Imagick::queryFormats("PDF")) === 1) {
if (extension_loaded('imagick') && count(@\Imagick::queryFormats("PDF")) === 1) {
class PDF extends Provider {

2
lib/private/preview/svg.php
Unescape Escape View File

@ -7,7 +7,7 @@
*/
namespace OC\Preview;
if (extension_loaded('imagick') && count(\Imagick::queryFormats("SVG")) === 1) {
if (extension_loaded('imagick') && count(@\Imagick::queryFormats("SVG")) === 1) {
class SVG extends Provider {

2
lib/private/preview/unknown.php
Unescape Escape View File

@ -22,7 +22,7 @@ class Unknown extends Provider {
$svgPath = substr_replace($path, 'svg', -3);
if (extension_loaded('imagick') && file_exists($svgPath) && count(\Imagick::queryFormats("SVG")) === 1) {
if (extension_loaded('imagick') && file_exists($svgPath) && count(@\Imagick::queryFormats("SVG")) === 1) {
// http://www.php.net/manual/de/imagick.setresolution.php#85284
$svg = new \Imagick();