- Added other part of bug 673 patch for linux vserver

[gosa.git] / gosa-core / setup / class_setupStep_Checks.inc

diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc
index a428485a55a7318faf432baed6ad04ee1c35f7c5..d231c4025cf63a1cfd52db8d8a744147ea35dbf3 100644 (file)
--- a/gosa-core/setup/class_setupStep_Checks.inc
+++ b/gosa-core/setup/class_setupStep_Checks.inc
@@ -149,14 +149,24 @@ 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 );
 
-    $N = msgPool::checkingFor(_("compression tool"));
+    $N = msgPool::checkingFor(_("compression module"));
     $D = _("GOsa requires this extension to handle snapshots.");
     $S = msgPool::installPhpModule("php5-zip / php5-gzip");
     $R = is_callable("gzcompress");