adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-05 17:32:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r15575 from trunk to branch 23

Browse Source 
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
This commit is contained in:
patdenice
2012-06-06 15:43:40 +00:00
parent 0a454adbf6
commit 1aaee9c883
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+19
View File
@@ -1649,4 +1649,23 @@ 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'];
}
?>