diff options
| author | patdenice <patdenice@piwigo.org> | 2012-06-07 10:48:57 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2012-06-07 10:48:57 +0000 |
| commit | 3d7971d640da317829f79d06f04ea455152e01be (patch) | |
| tree | 5844d1e678cda031702e9bfacf02298f882d2f55 | |
| parent | 227432815c051337ce889102f1838bfb349812e5 (diff) | |
bug:2647
Test 1and1 server with $_SERVER['SCRIPT_FILENAME']
git-svn-id: http://piwigo.org/svn/trunk@15583 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/include/image.class.php | 2 | ||||
| -rw-r--r-- | include/functions.inc.php | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php index 215d2dc5e..8aa55b307 100644 --- a/admin/include/image.class.php +++ b/admin/include/image.class.php @@ -509,7 +509,7 @@ class image_ext_imagick implements imageInterface $this->source_filepath = $source_filepath; $this->imagickdir = $conf['ext_imagick_dir']; - 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 429dd3ccc..2096eb79f 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -1692,23 +1692,4 @@ function mobile_theme() return $is_mobile_theme; } - -/** - * 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 |