From f3ff1e4ba5174dd559890483dd7dded8a04c10fd Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 02 Jul 2015 10:43:28 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/lib/update.lib.php | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index 1813a19..9fb57cb 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -123,6 +123,10 @@
function updateDbAndIni() {
global $inst, $conf;
+ //* check sql-mode
+ $check_sql_mode = $inst->db->queryOneRecord("SELECT @@sql_mode");
+ if ($check_sql_mode['@@sql_mode'] != '' && $check_sql_mode['@@sql_mode'] != 'NO_ENGINE_SUBSTITUTION') die('Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION');
+
//* Update $conf array with values from the server.ini that shall be preserved
$tmp = $inst->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']);
$ini_array = ini_to_array(stripslashes($tmp['config']));
--
Gitblit v1.9.1