dépôts
/
lhc
/
web
/
www.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SPIP] ~version 3.0.10-->3.0.11
[lhc/web/www.git]
/
www
/
ecrire
/
base
/
connect_sql.php
diff --git
a/www/ecrire/base/connect_sql.php
b/www/ecrire/base/connect_sql.php
index
ccecb8e
..
52e115a
100644
(file)
--- a/
www/ecrire/base/connect_sql.php
+++ b/
www/ecrire/base/connect_sql.php
@@
-236,7
+236,9
@@
function spip_connect_main($connexion)
}
if (!($f = $connexion['select'])) return false;
}
if (!($f = $connexion['select'])) return false;
- if (!$r = $f('valeur','spip_meta', "nom='charset_sql_connexion'"))
+ // en cas d'erreur select retourne la requette (is_string=true donc)
+ if (!$r = $f('valeur','spip_meta', "nom='charset_sql_connexion'")
+ OR is_string($r))
return false;
if (!($f = $connexion['fetch'])) return false;
$r = $f($r);
return false;
if (!($f = $connexion['fetch'])) return false;
$r = $f($r);