From b606b91272f1405577b31e005ab87d97f86013a7 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <blog@garv.in>
Date: Tue, 9 Sep 2014 13:17:34 +0200
Subject: [PATCH]  Proper SQLite PDO filenames in shared installations (Issue
 #214) References #214

---
 docs/NEWS                     | 3 +++
 include/db/pdo-sqlite.inc.php | 2 +-
 include/db/sqlite3.inc.php    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index cdf1369a..aec2c48f 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -8,6 +8,9 @@ Version 2.0-beta4 / RC? ()
       
     * 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)
 ------------------------------------------------------------------------
 
diff --git a/include/db/pdo-sqlite.inc.php b/include/db/pdo-sqlite.inc.php
index f457d936..3536d697 100644
--- a/include/db/pdo-sqlite.inc.php
+++ b/include/db/pdo-sqlite.inc.php
@@ -101,7 +101,7 @@ function serendipity_db_connect() {
     global $serendipity;
 
     $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'];
diff --git a/include/db/sqlite3.inc.php b/include/db/sqlite3.inc.php
index 16aee772..3c9c6d91 100644
--- a/include/db/sqlite3.inc.php
+++ b/include/db/sqlite3.inc.php
@@ -50,7 +50,7 @@ function serendipity_db_connect()
     }
 
 	// 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'];
 }