From f043e8e8ddd0c3e4cc3cc5c7f561ada67cac7ef9 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <mail@garv.in>
Date: Tue, 16 Feb 2010 13:06:44 +0000
Subject: [PATCH] sqlite3 strict check
---
docs/NEWS | 3 +++
include/functions_config.inc.php | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/docs/NEWS b/docs/NEWS
index 1f98c04c..e8bcf53a 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
Version 1.6 ()
------------------------------------------------------------------------
+ * Stricter check for sqlite3 extension, only functional interface
+ instead of OOP currently supported (garvinhicking)
+
* Experimental: When sending quoted-printable notification mails,
auto-split after 75 characters.
(Ref: http://board.s9y.org/viewtopic.php?f=3&t=16314)
diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 2569bbcd..921703dd 100644
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -895,10 +895,10 @@ function serendipity_probeInstallation($item) {
if (extension_loaded('mysqli')) {
$res['mysqli'] = 'MySQLi';
}
- if (extension_loaded('sqlite')) {
+ if (extension_loaded('sqlite') && function_exists('sqlite_open')) {
$res['sqlite'] = 'SQLite';
}
- if (extension_loaded('SQLITE3')) {
+ if (extension_loaded('SQLITE3') && function_exists('sqlite3_open')) {
$res['sqlite3'] = 'SQLite3';
}
if (function_exists('sqlrcon_alloc')) {