refs #1575 : add - backport 1f05f5a

-
Needlworks · May 21, 2015 · bdd9893 · bdd9893
1 parent 68c0e8d
commit bdd9893
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/framework/data/SQLite3/Adapter.php b/framework/data/SQLite3/Adapter.php
@@ -20,19 +20,14 @@ public static function bind($database) {
 			$database['server'] = $port[0];
 			$database['port'] = $port[1];
 		}
-<<<<<<< HEAD
-		self::$db = new SQLite3(__TEXTCUBE_CACHE_DIR__.'/'.$database['database'].'.sqlite');
-
-=======
 		if(!defined('__TEXTCUBE_DATA_DIR__')){
 			define('__TEXTCUBE_DATA_DIR__',__TEXTCUBE_CACHE_DIR__);
 		}
 		if(!file_exists(__TEXTCUBE_DATA_DIR__)) {
 			@mkdir(__TEXTCUBE_DATA_DIR__);
 		}
-		self::$db = new SQLite3(__TEXTCUBE_DATA_DIR__.'/'.$database['database'].'.db',SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE);
+		self::$db = new SQLite3(__TEXTCUBE_DATA_DIR__.'/'.$database['database'].'.sqlite',SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE);
 
->>>>>>> 1f05f5a...  refs #1575 : added - TEXTCUBE_DATA for sqlite file.
 		if(!self::$db) return false;
 
 		return true;