Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-15 d302d8e556da5b1dcd9ce4f9ec086a0e4aa52dd6

 interface/lib/classes/getconf.inc.php

@@ -39,7 +39,7 @@
      if(!isset($this->config[$server_id])) {
         $app->uses('ini_parser');
         $server_id = $app->functions->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']));
      }
      return ($section == '') ? $this->config[$server_id] : $this->config[$server_id][$section];