Browse files

# [#28335] Simplify schema path in installation, add support for other

databases. Thanks Michael.
  • Loading branch information...
1 parent edbe3a9 commit e6da83b4707b8114a287a5ea3f24aa2159ec4a0a @mbabker committed with infograf768 Jun 1, 2012
Showing with 7 additions and 2 deletions.
  1. +1 −0 installation/CHANGELOG
  2. +6 −2 installation/models/database.php
View
1 installation/CHANGELOG
@@ -32,6 +32,7 @@ $ -> Language fix or change
# [#28587] *ACL regression in com_redirect
# [#28579] Fix xreference regression from 1.7 to 2.5. Thanks Andrea.
# [#28561] Move some JFormFields from the platform to the CMS. Thanks Rouven.
+ # [#28335] Simplify schema path in installation, add support for other databases. Thanks Michael.
30-May-2012 Jean-Marie Simonet
$ Missing language string
View
8 installation/models/database.php
@@ -147,11 +147,15 @@ function initialise($options)
// Set the appropriate schema script based on UTF-8 support.
if ($type == 'mysqli' || $type == 'mysql')
{
- $schema = 'sql/'.(($type == 'mysqli') ? 'mysql' : $type).'/joomla.sql';
+ $schema = 'sql/mysql/joomla.sql';
}
elseif ($type == 'sqlsrv' || $type == 'sqlazure')
{
- $schema = 'sql/'.(($type == 'sqlsrv') ? 'sqlazure' : $type).'/joomla.sql';
+ $schema = 'sql/sqlazure/joomla.sql';
+ }
+ else
+ {
+ $schema = 'sql/'. $type . '/joomla.sql';
}
// Check if the schema is a valid file
if (!JFile::exists($schema)) {

0 comments on commit e6da83b

Please sign in to comment.