diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-03-17 05:30:44 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-03-17 05:30:44 +0000 |
| commit | 59ba11f18f9b43fc154018923c20dcc17db8ffa7 (patch) | |
| tree | 5996a3376bdd7f7766b9c034bde5ec3d503dff9d /phpBB/includes/db | |
| parent | 6c08fa7c26b5c291f5fd1f9ebf302914562cba7f (diff) | |
| download | forums-59ba11f18f9b43fc154018923c20dcc17db8ffa7.tar forums-59ba11f18f9b43fc154018923c20dcc17db8ffa7.tar.gz forums-59ba11f18f9b43fc154018923c20dcc17db8ffa7.tar.bz2 forums-59ba11f18f9b43fc154018923c20dcc17db8ffa7.tar.xz forums-59ba11f18f9b43fc154018923c20dcc17db8ffa7.zip | |
- Postgre installs now work... kinda...
git-svn-id: file:///svn/phpbb/trunk@5642 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/postgres.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php index e9d324e161..8e680e9968 100644 --- a/phpBB/includes/db/postgres.php +++ b/phpBB/includes/db/postgres.php @@ -14,7 +14,7 @@ if (!defined('SQL_LAYER')) { - define('SQL_LAYER', 'postgresql'); + define('SQL_LAYER', 'postgres'); include($phpbb_root_path . 'includes/db/dbal.' . $phpEx); /** @@ -122,7 +122,7 @@ class dbal_postgres extends dbal if (strpos($query, 'SELECT') === 0 && strpos($query, 'FROM (') !== false) { - $query = preg_replace('#FROM \((.+)\) #', 'FROM \1 ', $query); + $query = preg_replace('#FROM \(([^)]+)\)\s#', 'FROM \1 ', $query); } // EXPLAIN only in extra debug mode |