Commit 7616764b authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #4823 Fixed imagick detection in setup

parent 26322bd7
...@@ -1790,9 +1790,11 @@ class ImageAttribute extends FileAttribute ...@@ -1790,9 +1790,11 @@ class ImageAttribute extends FileAttribute
$this->value = $value; $this->value = $value;
} }
} else { } else {
msg_dialog::display(_("Error"), msg_dialog::display(
_("Cannot save user picture, FusionDirectory requires the package 'php5-imagick' to be installed!"), _('Error'),
ERROR_DIALOG); _('Cannot save user picture, FusionDirectory requires the PHP module "imagick" to be installed!'),
ERROR_DIALOG
);
} }
} }
......
...@@ -127,20 +127,12 @@ class Step_Checks extends setupStep ...@@ -127,20 +127,12 @@ class Step_Checks extends setupStep
$M = TRUE; $M = TRUE;
$basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); $basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
$N = msgPool::checkingFor(_("imagick")); $N = msgPool::checkingFor(_('imagick'));
$D = _("FusionDirectory requires this extension to handle images."); $D = _('FusionDirectory requires this extension to handle images.');
$S = msgPool::installPhpModule("php5-imagick"); $S = msgPool::installPhpModule('imagick');
$R = method_exists('imagick', 'getImageBlob');
$IMGVER = phpversion('imagick');
if ($IMGVER > 1.0) {
$R = method_exists('imagick', 'getImageBlob');
} else {
$R = is_callable("imagick_blob2image");
}
$M = TRUE; $M = TRUE;
$basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); $basic_checks[] = array('NAME' => $N , 'DESC' => $D , 'RESULT' => $R , 'SOLUTION' => $S , 'MUST' => $M );
$N = msgPool::checkingFor(_("compression module")); $N = msgPool::checkingFor(_("compression module"));
$D = _("FusionDirectory requires this extension to handle snapshots."); $D = _("FusionDirectory requires this extension to handle snapshots.");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment