Dotclear


Ignore:
Timestamp:
04/20/15 11:08:22 (10 years ago)
Author:
Nicolas <nikrou77@…>
Branch:
default
Message:

Fix #1913 : allow SQLite in installation wizard.
No simple way to upgrade SQLite database, so bypass upgrade during connection.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • admin/install/wizard.php

    r2792 r2994  
    6666     try 
    6767     { 
     68          if ($DBDRIVER == 'sqlite') { 
     69               if (strpos($DBNAME, '/') === false) { 
     70                    $sqlite_db_directory = dirname(DC_RC_PATH).'/../db/'; 
     71                    files::makeDir($sqlite_db_directory,true); 
     72 
     73                    # Can we write sqlite_db_directory ? 
     74                    if (!is_writable($sqlite_db_directory)) { 
     75                         throw new Exception(sprintf(__('Cannot write "%s" directory.'),path::real($sqlite_db_directory,false))); 
     76                    } 
     77                    $DBNAME = $sqlite_db_directory.$DBNAME; 
     78               } 
     79          } 
     80 
    6881          # Tries to connect to database 
    6982          try { 
     
    182195'<form action="wizard.php" method="post">'. 
    183196'<p><label class="required" for="DBDRIVER"><abbr title="'.__('Required field').'">*</abbr> '.__('Database type:').'</label> '. 
    184 form::combo('DBDRIVER',array(__('MySQL (deprecated)')=>'mysql',__('MySQLi')=>'mysqli',__('PostgreSQL')=>'pgsql'),$DBDRIVER).'</p>'. 
     197    form::combo('DBDRIVER',array(__('MySQL (deprecated)')=>'mysql',__('MySQLi')=>'mysqli',__('PostgreSQL')=>'pgsql',__('SQLite')=>'sqlite'),$DBDRIVER).'</p>'. 
    185198'<p><label for="DBHOST">'.__('Database Host Name:').'</label> '. 
    186199form::field('DBHOST',30,255,html::escapeHTML($DBHOST)).'</p>'. 
Note: See TracChangeset for help on using the changeset viewer.

Sites map