From aad6614e96db70ea379c7c854a8b174dbaa553cb Mon Sep 17 00:00:00 2001
From: Matthieu Marcillaud <marcimat@rezo.net>
Date: Tue, 15 Sep 2009 12:45:52 +0000
Subject: [PATCH] =?UTF-8?q?Attention,=20en=20sqlite,=20on=20n'a=20pas=20to?=
=?UTF-8?q?ujours=20une=20ressource=E2=80=A6=20Suite=20de=20[14341]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/req/sqlite_generique.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/ecrire/req/sqlite_generique.php b/ecrire/req/sqlite_generique.php
index e9469e6733..7c6223fb83 100644
--- a/ecrire/req/sqlite_generique.php
+++ b/ecrire/req/sqlite_generique.php
@@ -439,8 +439,7 @@ function spip_sqlite_countsel($from = array(), $where = array(), $groupby = '',
$c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby)));
$r = spip_sqlite_select("COUNT($c)", $from, $where,'', '', $limit,
$having, $serveur, $requeter);
-
- if (is_resource($r) && $requeter) {
+ if ((is_resource($r) or is_object($r)) && $requeter) { // ressource : sqlite2, object : sqlite3
if (_sqlite_is_version(3,'',$serveur)){
list($r) = spip_sqlite_fetch($r, SPIP_SQLITE3_NUM, $serveur);
} else {
--
GitLab