merged stable to master

This commit is contained in:
following
2013-07-14 21:36:51 +02:00
5 changed files with 70 additions and 61 deletions

View File

@ -178,11 +178,11 @@ function sql_foundrows_done()
function set_domain()
{
global $opt;
if (!isset($opt['domain']))
return;
$domain = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
if ($domain == '')
$opt['page']['domain'] = $domain;
if (!isset($opt['domain']) || $domain == '')
return;
if (isset($opt['domain'][$domain]))