From 8e38755040c6c2073f92f0ffb087da530d0e7a0a Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Mon, 12 Nov 2012 11:49:26 -0500 Subject: [PATCH] - Changed a German translation. - Extended SEO redirect check for subdomains/alias domains. --- interface/lib/classes/getconf.inc.php | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php index 2a9dcc1..ad2a302 100644 --- a/interface/lib/classes/getconf.inc.php +++ b/interface/lib/classes/getconf.inc.php @@ -34,12 +34,12 @@ public function get_server_config($server_id, $section = '') { global $app; - - if(!is_array($this->config[$server_id])) { + + if(!isset($this->config[$server_id])) { $app->uses('ini_parser'); - $server_id = intval($server_id); - $server = $app->db->queryOneRecord("SELECT config FROM server WHERE server_id = $server_id"); - $this->config[$server_id] = $app->ini_parser->parse_ini_string(stripslashes($server["config"])); + $server_id = $app->functions->intval($server_id); + $server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = '.$server_id); + $this->config[$server_id] = $app->ini_parser->parse_ini_string(stripslashes($server['config'])); } return ($section == '') ? $this->config[$server_id] : $this->config[$server_id][$section]; } @@ -47,13 +47,13 @@ public function get_global_config($section = '') { global $app; - if(!is_array($this->config['global'])) { + if(!isset($this->config['global'])) { $app->uses('ini_parser'); - $tmp = $app->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1"); - $this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp["config"])); + $tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1'); + $this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp['config'])); } return ($section == '') ? $this->config['global'] : $this->config['global'][$section]; } } -?> \ No newline at end of file +?> -- Gitblit v1.9.1