diff --git a/ecrire/install/etape_3.php b/ecrire/install/etape_3.php index b900cc8871f99d004609221c0b0e04092c410a69..8c39efe34ebee2e680423ea5d6f5340dbb0537e9 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 89a6125b77a936d78e6192f7c427fd769c8f4802..d0376cb72e7be2a3ee19a528568ddaaa68490d2a 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 "