Merge branch 'FIXSQL' into 'master'

Fix #1039

See The Issue for more details.

See merge request !327

libraries/adodb/adodb.inc.php

@@ -1358,7 +1358,7 @@ if (!defined('_ADODB_LAYER')) {
 	 * @return  the last inserted ID. Not all databases support this.
 	 */
 	function Insert_ID($table='',$column='') {
-		if ($this->_logsql && $this->lastInsID) {
+		if ($this->_logsql || $this->lastInsID) {
 			return $this->lastInsID;
 		}
 		if ($this->hasInsertID) {

libraries/adodb/drivers/adodb-mysqli.inc.php

@@ -195,6 +195,7 @@ class ADODB_mysqli extends ADOConnection {
 		if (!$ok) return $this->RollbackTrans();
 
 		if ($this->transCnt) $this->transCnt -= 1;
+		$this->lastInsID = $this->_insertid();
 		$this->Execute('COMMIT');
 
 		//$this->Execute('SET AUTOCOMMIT=1');