archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged r15583 from trunk to branch 23

Browse source 
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
This commit is contained in:
patdenice 2012-06-07 10:52:43 +00:00
parent 1aaee9c883
commit 9aa13bd5ef
2 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/include/image.class.php
View file

@ -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');
}

19
include/functions.inc.php
View file

@ -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'];
}
?>