diff --git a/libraries/adodb/adodb-datadict.inc.php b/libraries/adodb/adodb-datadict.inc.php index b8b881e9de6c1c3b71545711cfe8670f62637f6a..8b07e204a01b629a1e18303147b8a9d235b7eeef 100644 --- a/libraries/adodb/adodb-datadict.inc.php +++ b/libraries/adodb/adodb-datadict.inc.php @@ -750,6 +750,7 @@ class ADODB_DataDict { if ($fdefts) { if (substr($this->connection->databaseType,0,5) == 'mysql') { $ftype = 'TIMESTAMP'; + $fdefault = ' CURRENT_TIMESTAMP'; /* STRICT_TRANS_TABLES fix */ } else { $fdefault = $this->connection->sysTimeStamp; } diff --git a/vtlib/Vtiger/FieldBasic.php b/vtlib/Vtiger/FieldBasic.php index f42b2638315a2fc721ba70dda5249fc181512953..15cc335e46a1494b999996263e4e65790c11b2f2 100644 --- a/vtlib/Vtiger/FieldBasic.php +++ b/vtlib/Vtiger/FieldBasic.php @@ -175,10 +175,10 @@ class Vtiger_FieldBasic { $adb->pquery("INSERT INTO vtiger_field (tabid, fieldid, columnname, tablename, generatedtype, uitype, fieldname, fieldlabel, readonly, presence, defaultvalue, maximumlength, sequence, block, displaytype, typeofdata, quickcreate, quickcreatesequence, info_type, helpinfo, summaryfield) -VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array($this->getModuleId(), $this->id, $this->column, $this->table, $this->generatedtype, +VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array($this->getModuleId(), $this->id, $this->column, $this->table, intval($this->generatedtype), $this->uitype, $this->name, $this->label, $this->readonly, $this->presence, $this->defaultvalue, $this->maximumlength, $this->sequence, $this->getBlockId(), $this->displaytype, $this->typeofdata, - $this->quickcreate, $this->quicksequence, $this->info_type, $this->helpinfo, $this->summaryfield)); + intval($this->quickcreate), intval($this->quicksequence), $this->info_type, $this->helpinfo, intval($this->summaryfield))); // Set the field status for mass-edit (if set) $adb->pquery('UPDATE vtiger_field SET masseditable=? WHERE fieldid=?', Array($this->masseditable, $this->id)); @@ -305,4 +305,4 @@ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array($this->getModuleId(), Vtiger_Utils::Log($message, $delim); } } -?> \ No newline at end of file +?> diff --git a/vtlib/Vtiger/Link.php b/vtlib/Vtiger/Link.php index 6898baa545cfb076f92683d61d10d1b1e52e1919..5447be3359693d85f370d30f0469c76b8f075d0c 100644 --- a/vtlib/Vtiger/Link.php +++ b/vtlib/Vtiger/Link.php @@ -112,7 +112,7 @@ class Vtiger_Link { $uniqueid = self::__getUniqueId(); $sql = 'INSERT INTO vtiger_links (linkid,tabid,linktype,linklabel,linkurl,linkicon,'. 'sequence'; - $params = Array($uniqueid, $tabid, $type, $label, $url, $iconpath, $sequence); + $params = Array($uniqueid, $tabid, $type, $label, $url, $iconpath, intval($sequence)); if(!empty($handlerInfo)) { $sql .= (', handler_path, handler_class, handler'); $params[] = $handlerInfo['path'];