aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2010-01-17 17:41:21 +0000
committerChris Smith <toonarmy@phpbb.com>2010-01-17 17:41:21 +0000
commitbdf60ab2c118ae7b6374909ecf172cf6d5a112fd (patch)
tree2f8db2b70ff458a86ad3d35c4dd6f6e16094593d /phpBB
parent5cce7d0bae22271b942b16e8343efec87f33dc89 (diff)
downloadforums-bdf60ab2c118ae7b6374909ecf172cf6d5a112fd.tar
forums-bdf60ab2c118ae7b6374909ecf172cf6d5a112fd.tar.gz
forums-bdf60ab2c118ae7b6374909ecf172cf6d5a112fd.tar.bz2
forums-bdf60ab2c118ae7b6374909ecf172cf6d5a112fd.tar.xz
forums-bdf60ab2c118ae7b6374909ecf172cf6d5a112fd.zip
The easy solution to all my problems with SQLite is this. :( #56105
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10422 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_install.php9
2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index f90e1e84f3..ded991fa32 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -145,6 +145,7 @@
<li>[Change] Forum feed no longer includes posts of subforums.</li>
<li>[Change] Show login attempt CAPTCHA option in the captcha plugin module.</li>
<li>[Change] It is no longer possible to persist a solution for the login CAPTCHA.</li>
+ <li>[Change] SQLite is no longer autoloaded by the installer. (Bug #56105)</li>
</ul>
<a name="v305"></a><h3>1.ii. Changes since 3.0.5</h3>
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index a5889224a1..1b9c66fc84 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -23,7 +23,14 @@ function can_load_dll($dll)
{
// SQLite2 is a tricky thing, from 5.0.0 it requires PDO; if PDO is not loaded we must state that SQLite is unavailable
// as the installer doesn't understand that the extension has a prerequisite.
- if ($dll == 'sqlite' && version_compare(PHP_VERSION, '5.0.0', '>=') && !extension_loaded('pdo'))
+ //
+ // On top of this sometimes the SQLite extension is compiled for a different version of PDO
+ // by some Linux distributions which causes phpBB to bomb out with a blank page.
+ //
+ // Net result we'll disable automatic inclusion of SQLite support
+ //
+ // See: r9618 and #56105
+ if ($dll == 'sqlite')
{
return false;
}