Merge remote-tracking branch 'ispc/master'

Marius Cramer

2015-05-21 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f

 server/lib/classes/getconf.inc.php

@@ -38,7 +38,7 @@
      if(!is_array($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);
         $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']));
      }