Changeset 15584


Ignore:
Timestamp:
Jun 7, 2012, 12:52:43 PM (8 years ago)
Author:
patdenice
Message:

Merged r15583 from trunk to branch 23
bug:2647
Test 1and1 server with $_SERVERSCRIPT_FILENAME

Location:
branches/2.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.3/admin/include/image.class.php

    r15576 r15584  
    421421    $this->imagickdir = $imagickdir;
    422422
    423     if (get_host() == 'kundenserver.de')  // 1and1
     423    if (strpos(@$_SERVER['SCRIPT_FILENAME'], '/kunden/') === 0)  // 1and1
    424424    {
    425425      @putenv('MAGICK_THREAD_LIMIT=1');
  • branches/2.3/include/functions.inc.php

    r15576 r15584  
    16501650  return implode('.', array_slice(explode('.', $version), 0, 2));
    16511651}
    1652 
    1653 /**
    1654  * return hostname with gethostbyaddr and keep it in database
    1655  */
    1656 function get_host($force_update=false)
    1657 {
    1658   global $conf;
    1659 
    1660   if (!isset($conf['host']) or $force_update)
    1661   {
    1662     $conf['host'] = 'undefined';
    1663     if ($host = @gethostbyaddr($_SERVER['SERVER_ADDR']))
    1664     {
    1665       $conf['host'] = $host;
    1666     }
    1667     conf_update_param('host', $conf['host']);
    1668   }
    1669   return $conf['host'];
    1670 }
    16711652?>
Note: See TracChangeset for help on using the changeset viewer.