diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-14 12:49:52 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-14 12:49:52 +0100 |
| commit | 4b603cd2f893da633519079bf9fa83e8fe625931 (patch) | |
| tree | e10c2f837fc90a4179ee4e7663e90cd8e6e548eb | |
| parent | afe133d5d1cec3b910da72969361c6134e5f398e (diff) | |
| parent | f62f1658ceba6ad02ada0823243d779a698f5f7f (diff) | |
| download | nextcloud-server-4b603cd2f893da633519079bf9fa83e8fe625931.tar.gz nextcloud-server-4b603cd2f893da633519079bf9fa83e8fe625931.zip | |
Merge pull request #7201 from owncloud/fix_error_msg_imagick_queryFormats
suppress error msg caused by php bug
| -rw-r--r-- | lib/private/preview/office.php | 2 | ||||
| -rw-r--r-- | lib/private/preview/pdf.php | 2 | ||||
| -rw-r--r-- | lib/private/preview/svg.php | 2 | ||||
| -rw-r--r-- | lib/private/preview/unknown.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php index 884b6e7dc9b..02bb22e9b94 100644 --- a/lib/private/preview/office.php +++ b/lib/private/preview/office.php @@ -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 diff --git a/lib/private/preview/pdf.php b/lib/private/preview/pdf.php index 572b8788ac9..d390b4fc677 100644 --- a/lib/private/preview/pdf.php +++ b/lib/private/preview/pdf.php @@ -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 { diff --git a/lib/private/preview/svg.php b/lib/private/preview/svg.php index 07a37e8f8c1..9a73fff9467 100644 --- a/lib/private/preview/svg.php +++ b/lib/private/preview/svg.php @@ -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 { diff --git a/lib/private/preview/unknown.php b/lib/private/preview/unknown.php index 8145c826149..2d3b5c5655e 100644 --- a/lib/private/preview/unknown.php +++ b/lib/private/preview/unknown.php @@ -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(); |