diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 17:57:22 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 17:57:22 +0200 |
| commit | f0be9549ac14c49cad44b1476382aedf2a6f4af8 (patch) | |
| tree | 561c55b0db3d3908d57095601a4483a920b02736 /phpBB/includes/functions.php | |
| parent | 1dd02b0a916f1cd7672ffc247f09c9b6d4598d7c (diff) | |
| parent | 5496dd41ed04cf41bca15c6f9a9e9439d213100b (diff) | |
| download | forums-f0be9549ac14c49cad44b1476382aedf2a6f4af8.tar forums-f0be9549ac14c49cad44b1476382aedf2a6f4af8.tar.gz forums-f0be9549ac14c49cad44b1476382aedf2a6f4af8.tar.bz2 forums-f0be9549ac14c49cad44b1476382aedf2a6f4af8.tar.xz forums-f0be9549ac14c49cad44b1476382aedf2a6f4af8.zip | |
Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into develop-ascraeus
* github-nickvergessen/feature/sqlite3:
[feature/sqlite3] Add sqlite3 database to .gitignore
[feature/sqlite3] Use SQLite3 by default
[feature/sqlite3] Remove invalid comment
[feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries
[feature/sqlite3] Correctly recreate indexes when recreating a table
[feature/sqlite3] Fix sql_index_drop() for sqlite3
[feature/sqlite3] Remove trailing comma from column list
[feature/sqlite3] Update docblocks and function visibility
[feature/sqlite3] Add support for SQLite 3
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7b6345b9e3..786003a9ff 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3989,7 +3989,7 @@ function obtain_guest_count($item_id = 0, $item = 'forum') // Get number of online guests - if ($db->sql_layer === 'sqlite') + if ($db->sql_layer === 'sqlite' || $db->sql_layer === 'sqlite3') { $sql = 'SELECT COUNT(session_ip) as num_guests FROM ( |