From e879b356b133b9465fca9248dcb58a60f664b1fa Mon Sep 17 00:00:00 2001 From: opensides Date: Wed, 20 May 2009 15:22:09 +0000 Subject: [PATCH] - Closes #622 git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13659 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/setup/class_setupStep_Checks.inc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc index 7aff0f55d..d231c4025 100644 --- a/gosa-core/setup/class_setupStep_Checks.inc +++ b/gosa-core/setup/class_setupStep_Checks.inc @@ -149,10 +149,20 @@ class Step_Checks extends setup_step $output.= fread($sh, 4096); } pclose($sh); + $N = msgPool::checkingFor(_("imagick")); $D = _("GOsa requires this extension to handle images."); $S = msgPool::installPhpModule("php5-imagick"); - $R = is_callable("imagick_blob2image") || !empty($output); + + $IMGVER = phpversion('imagick'); + + if ($IMGVER > 1.0) { + $R = method_exists('imagick','getImageBlob'); + } + else { + $R = is_callable("imagick_blob2image") || !empty($output); + } + $M = TRUE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); -- 2.30.2