mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Proper SQLite PDO filenames in shared installations (Issue #214)

Browse Source 
References #214
This commit is contained in:
Garvin Hicking
2014-09-09 13:17:34 +02:00
parent 2624bcadec
commit b606b91272
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/NEWS
View File

@ -8,6 +8,9 @@ Version 2.0-beta4 / RC? ()
* Improve RegExp for Feed-URL matching, thanks to fugue88 * Improve RegExp for Feed-URL matching, thanks to fugue88
* Proper SQLite PDO filenames in shared installations (Issue #214)
Version 2.0-beta3 (July 25th, 2014) Version 2.0-beta3 (July 25th, 2014)
------------------------------------------------------------------------ ------------------------------------------------------------------------

2
include/db/pdo-sqlite.inc.php
View File

@ -101,7 +101,7 @@ function serendipity_db_connect() {
global $serendipity; global $serendipity;
$serendipity['dbConn'] = new PDO( $serendipity['dbConn'] = new PDO(
'sqlite:' . $serendipity['serendipityPath'] . $serendipity['dbName'] . '.db' 'sqlite:' . (defined('S9Y_DATA_PATH') ? S9Y_DATA_PATH : $serendipity['serendipityPath']) . $serendipity['dbName'] . '.db'
); );
return $serendipity['dbConn']; return $serendipity['dbConn'];

2
include/db/sqlite3.inc.php
View File

@ -50,7 +50,7 @@ function serendipity_db_connect()
} }
// SQLite3 doesn't support persistent connections // SQLite3 doesn't support persistent connections
$serendipity['dbConn'] = sqlite3_open($serendipity['serendipityPath'] . $serendipity['dbName'] . '.db'); $serendipity['dbConn'] = sqlite3_open((defined('S9Y_DATA_PATH') ? S9Y_DATA_PATH : $serendipity['serendipityPath']) . $serendipity['dbName'] . '.db');
return $serendipity['dbConn']; return $serendipity['dbConn'];
} }