Changeset 2823

Timestamp:

11/19/08 20:09:31 (7 weeks ago)

Author:

rickc

Message:

Create an SQLite db in either /user or /user/sites/url if only a file name is given in the config file, depending on whether it's a multisite installation or not. Change should be transparent to existing installations. If the config file contains a path instead of a bare file name, the path will be honored. Fixes ticket #273.

Files:

• trunk/htdocs/system/schema/sqlite/connection.php (modified) (1 diff)

trunk/htdocs/system/schema/sqlite/connection.php

@@ -57 +57 @@
     {
         list( $type, $file )= explode( ':', $connect_string, 2 );
+        if( $file == basename( $file ) ) {
+            if( file_exists( HABARI_PATH . '/' . $file ) ) {
+                $file = HABARI_PATH . '/' . $file;
+            }
+            else {
+                $file = HABARI_PATH . '/' . Site::get_path( 'user', TRUE ) . $file;
+            }
+            $connect_string = implode( ':', array( $type, $file ) );
+        }
         return parent::connect( $connect_string, $db_user, $db_pass );
     }