partkeepr

fork of partkeepr
git clone https://git.e1e0.net/partkeepr.git
Log | Files | Refs | Submodules | README | LICENSE

commit 4421f7547d0338163ebc20a534d4e577ee1783b8
parent eb173e878f4657684aea436309148b4867740898
Author: Timo A. Hummel <felicitus@felicitus.org>
Date:   Mon,  2 Nov 2015 22:51:39 +0100

Removed chec for Imagick, refers to #445

Diffstat:
Msrc/PartKeepr/FrontendBundle/Controller/IndexController.php | 18++----------------
1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/PartKeepr/FrontendBundle/Controller/IndexController.php b/src/PartKeepr/FrontendBundle/Controller/IndexController.php @@ -33,22 +33,8 @@ class IndexController extends Controller $aParameters["maxUploadSize"] = min($maxPostSize, $maxFileSize); - if (!class_exists("Imagick")) { - // @todo This check is deprecated and shouldn't be done here. Sf2 should automatically take care of this - - return $this->render('PartKeeprFrontendBundle::error.html.twig', - array( - "title" => PartKeepr::i18n("ImageMagick is not installed"), - "error" => PartKeepr::i18n( - "You are missing the ImageMagick extension. Please install it and restart the setup to verify that the library was installed correctly." - ), - ) - ); - } - - /* ImageMagick formats */ - $imagick = new \Imagick(); - $aParameters["availableImageFormats"] = $imagick->queryFormats(); + // @todo Hardcoded for now due to GD, see #445 + $aParameters["availableImageFormats"] = array("JPG", "GIF", "PNG"); /* Automatic Login */ if (Configuration::getOption("partkeepr.frontend.autologin.enabled", false) === true) {