From 36b410f9e5cb83a19d2d980d3dc5b4fa76d90191 Mon Sep 17 00:00:00 2001
From: prasad <prasad@vtiger.com>
Date: Fri, 13 May 2016 09:37:24 +0530
Subject: [PATCH] Fixes to work with STRICT_TRANS_TABLES sql_mode
---
libraries/adodb/adodb-datadict.inc.php | 1 +
vtlib/Vtiger/FieldBasic.php | 6 +++---
vtlib/Vtiger/Link.php | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/libraries/adodb/adodb-datadict.inc.php b/libraries/adodb/adodb-datadict.inc.php
index b8b881e9d..8b07e204a 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 f42b26383..15cc335e4 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 6898baa54..5447be335 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'];
--
GitLab