aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2012-06-07 10:52:43 +0000
committerpatdenice <patdenice@piwigo.org>2012-06-07 10:52:43 +0000
commit9aa13bd5efd5ace215fa156fb12165153686312e (patch)
tree517cb9d4ae9345ccac7d09c493728b8d96da3a1c /admin
parent1aaee9c88324d5d5eb45e53f80c1242e814631a3 (diff)
Merged r15583 from trunk to branch 23
bug:2647 Test 1and1 server with $_SERVER['SCRIPT_FILENAME'] git-svn-id: http://piwigo.org/svn/branches/2.3@15584 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/include/image.class.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php
index c45669d8d..2bf9f2d78 100644
--- a/admin/include/image.class.php
+++ b/admin/include/image.class.php
@@ -420,7 +420,7 @@ class image_ext_imagick implements imageInterface
$this->source_filepath = $source_filepath;
$this->imagickdir = $imagickdir;
- if (get_host() == 'kundenserver.de') // 1and1
+ if (strpos(@$_SERVER['SCRIPT_FILENAME'], '/kunden/') === 0) // 1and1
{
@putenv('MAGICK_THREAD_LIMIT=1');
}