Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-12-19 62e25488daa4f857f717d2687e820091ffaa8a13

 interface/lib/classes/db_mysql.inc.php

@@ -86,7 +86,7 @@
         $this->_sqlerror('Zugriff auf Datenbankserver fehlgeschlagen! / Database server not accessible!');
         return false;
      }
      if(!((bool)mysqli_query( $this->_iConnId, "USE $this->dbName"))) {
      if(!((bool)mysqli_query( $this->_iConnId, 'USE `' . $this->dbName . '`'))) {
         $this->close();
         $this->_sqlerror('Datenbank nicht gefunden / Database not found');
         return false;
@@ -179,6 +179,11 @@
         
         if($ids_config['sql_scan_enabled'] == 'yes') {
            
            // Remove whitespace
            $string = trim($string);
            if(substr($string,-1) == ';') $string = substr($string,0,-1);
				
            // Save original string
            $string_orig = $string;
            
            //echo $string;