From e458c75c19ab17a0a31956e21eaa7475ba47f748 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Wed, 19 Dec 2007 11:44:48 +0000
Subject: [PATCH] =?UTF-8?q?[10968]=20suite:=20bonne=20id=C3=A9e=20d'interr?=
=?UTF-8?q?oger=20le=20charset=20distant,=20mais=20il=20faut=20s'assurer?=
=?UTF-8?q?=20que=20c'est=20un=20site=20sous=20SPIP,=20sinon=20=C3=A7a=20d?=
=?UTF-8?q?=C3=A9clenche=20une=20erreur=20faussement=20inqui=C3=A9tante.?=
=?UTF-8?q?=20Et=20utiliser=20=C3=A0=20fond=20les=20fonctions=20d'abstract?=
=?UTF-8?q?ions,=20=C3=A7a=20gagne=20du=20code.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/base/connect_sql.php | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/ecrire/base/connect_sql.php b/ecrire/base/connect_sql.php
index 871392ef5b..a501be1a99 100644
--- a/ecrire/base/connect_sql.php
+++ b/ecrire/base/connect_sql.php
@@ -85,12 +85,10 @@ function spip_connect($serveur='', $version='') {
return false;
}
} else {
- $charset = -1;
- if (($f = $connexions[$index][$version]['select'])
- && ($r = $f('valeur','spip_meta', "nom='charset_sql_connexion'",'','','','',$serveur))
- && ($f = $connexions[$index][$version]['fetch'])
- && ($r = $f($r, NULL,$serveur)))
- $charset = $r['valeur'] ? $r['valeur'] : -1;
+ if ($connexions[$index]['spip_connect_version']
+ AND $r = sql_getfetsel('valeur', 'spip_meta', "nom='charset_sql_connexion'",'','','','',$serveur))
+ $charset = $r;
+ else $charset = -1;
}
if ($charset != -1) {
$f = $GLOBALS[$jeu]['set_charset'];
--
GitLab