diff options
| author | patdenice <patdenice@piwigo.org> | 2012-06-06 15:43:40 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2012-06-06 15:43:40 +0000 |
| commit | 1aaee9c88324d5d5eb45e53f80c1242e814631a3 (patch) | |
| tree | bfc2d2c732e94d49d3ed7f8f49afae679c95bd3b /admin | |
| parent | 0a454adbf65947398e4a364a376cf2874fb8a118 (diff) | |
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
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/include/image.class.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php index 53a27b924..c45669d8d 100644 --- a/admin/include/image.class.php +++ b/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)) |