From 0a00f5ca9c6f287571dc8648ee880f3a72dead51 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Tue, 18 Feb 2014 16:45:59 +1300 Subject: [PATCH] Cleaning up long line lengths in _config.php --- _config.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/_config.php b/_config.php index f018bac..d765dee 100644 --- a/_config.php +++ b/_config.php @@ -8,9 +8,16 @@ if(defined('SS_DATABASE_CLASS') && in_array(SS_DATABASE_CLASS, $classes)) { } if(in_array($databaseConfig['type'], $classes)) { - if(empty($databaseConfig['path'])) $databaseConfig['path'] = defined('SS_SQLITE_DATABASE_PATH') && SS_SQLITE_DATABASE_PATH ? SS_SQLITE_DATABASE_PATH : ASSETS_PATH . '/.sqlitedb/'; // where to put the database file + if(empty($databaseConfig['path'])) { + // default the database path to a location in assets + $databaseConfig['path'] = defined('SS_SQLITE_DATABASE_PATH') && SS_SQLITE_DATABASE_PATH ? SS_SQLITE_DATABASE_PATH : ASSETS_PATH . '/.sqlitedb/'; + } + $databaseConfig['database'] = (defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : '') . $databaseConfig['database'] . (defined('SS_DATABASE_SUFFIX') ? SS_DATABASE_SUFFIX : ''); - if(empty($databaseConfig['key'])) $databaseConfig['key'] = defined('SS_SQLITE_DATABASE_KEY') && SS_SQLITE_DATABASE_KEY ? SS_SQLITE_DATABASE_KEY : 'SQLite3DatabaseKey'; + + if(empty($databaseConfig['key'])) { + $databaseConfig['key'] = defined('SS_SQLITE_DATABASE_KEY') && SS_SQLITE_DATABASE_KEY ? SS_SQLITE_DATABASE_KEY : 'SQLite3DatabaseKey'; + } /** * set pragma values on the connection. @@ -25,4 +32,4 @@ if(in_array($databaseConfig['type'], $classes)) { } else { $databaseConfig['type'] = 'SQLitePDODatabase'; } -} \ No newline at end of file +}