merge r15575 from trunk to branch 23

bug:2647
External ImageMagick does not work anymore on 1and1 servers


git-svn-id: http://piwigo.org/svn/branches/2.3@15576 68402e56-0260-453c-a942-63ccdbb3a9ee

admin/include/image.class.php

@@ -420,6 +420,11 @@ class image_ext_imagick implements imageInterface
     $this->source_filepath = $source_filepath;
     $this->imagickdir = $imagickdir;
 
+    if (get_host() == 'kundenserver.de')  // 1and1
+    {
+      @putenv('MAGICK_THREAD_LIMIT=1');
+    }
+
     $command = $imagickdir.'identify -format "%wx%h" "'.realpath($source_filepath).'"';
     @exec($command, $returnarray);
     if(!is_array($returnarray) or empty($returnarray[0]) or !preg_match('/^(\d+)x(\d+)$/', $returnarray[0], $match))