From 9aa13bd5efd5ace215fa156fb12165153686312e Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Thu, 7 Jun 2012 10:52:43 +0000
Subject: 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
---
 admin/include/image.class.php |  2 +-
 include/functions.inc.php     | 19 -------------------
 2 files changed, 1 insertion(+), 20 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');
     }
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 15baa8fef..f6b8303b6 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1649,23 +1649,4 @@ function get_branch_from_version($version)
 {
   return implode('.', array_slice(explode('.', $version), 0, 2));
 }
-
-/**
- * return hostname with gethostbyaddr and keep it in database
- */
-function get_host($force_update=false)
-{
-  global $conf;
-
-  if (!isset($conf['host']) or $force_update)
-  {
-    $conf['host'] = 'undefined';
-    if ($host = @gethostbyaddr($_SERVER['SERVER_ADDR']))
-    {
-      $conf['host'] = $host;
-    }
-    conf_update_param('host', $conf['host']);
-  }
-  return $conf['host'];
-}
 ?>
\ No newline at end of file
-- 
cgit v1.2.3