From 41de099aec4928e6e51eef4ac6ed12be4138f6ba Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 22 Jan 2008 22:08:19 +0000
Subject: [PATCH] changeons le nom de la constante pour eviter les crash chez
ceux qui l'avaient mis manuellement
---
ecrire/install/etape_3.php | 2 +-
ecrire/req/mysql.php | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ecrire/install/etape_3.php b/ecrire/install/etape_3.php
index b900cc8871..8c39efe34e 100644
--- a/ecrire/install/etape_3.php
+++ b/ecrire/install/etape_3.php
@@ -299,7 +299,7 @@ function test_sql_mode_mysql($server_db){
$res = sql_select("version() as v",'','','','','','',$server_db);
$row = sql_fetch($res,$server_db);
if (version_compare($row['v'],'5.0','>='))
- return "define('_MYSQL_SQL_MODE_TEXT_NOT_NULL',true);\n";
+ return "define('_MYSQL_SET_SQL_MODE',true);\n";
return '';
}
?>
diff --git a/ecrire/req/mysql.php b/ecrire/req/mysql.php
index 89a6125b77..d0376cb72e 100644
--- a/ecrire/req/mysql.php
+++ b/ecrire/req/mysql.php
@@ -24,7 +24,9 @@ function req_mysql_dist($host, $port, $login, $pass, $db='', $prefixe='', $ldap=
$db = 'spip';
} else {
$ok = spip_mysql_selectdb($db);
- if (defined('_MYSQL_SQL_MODE_TEXT_NOT_NULL'))
+ if (defined('_MYSQL_SET_SQL_MODE')
+ OR defined('_MYSQL_SQL_MODE_TEXT_NOT_NULL') // compatibilite
+ )
mysql_query("set sql_mode=''");
}
# spip_log("Connexion vers $host, base $db, prefixe $prefixe "
--
GitLab