Commit Graph

13 Commits

Author SHA1 Message Date
Vincent Petry 0436453353 Merge pull request #7720 from ideaship/autoconfig_fix
fix autoconfig
2014-03-28 10:41:46 +01:00
Vincent Petry 6de9033d86 Added warning for Mac OS on setup page 2014-03-20 12:57:55 +01:00
ideaship a5425e84f2 fix autoconfig
In array_merge, $post overrides $opts (concerns data directory).
Always merge $post before calling display().
Default value for dbtype which may still be undefined in display().

Fixes several problems related to autoconfig:
- installation.php only showed $AUTOCONFIG data if it was called after
  install() had come back with errors
- if autoconfig.php was set, installation.php showed an editable field
  with the wrong data in it; then, regardless of any changes, the value
  from autoconfig.php was used
- installation.php used undefined indeces (dbtype, dbIsSet,
  directoryIsSet)
2014-03-13 20:05:11 +01:00
Joas Schilling dbec143f09 Change MySQL to MySQL/MariaDB in the frontend
Fix issue #6269
2014-02-07 17:03:43 +01:00
Thomas Müller e2625ae7aa fixing autoconfig handling 2014-02-05 18:23:40 +01:00
Bart Visscher d8ec7e2701 DRY for database type radiolist 2014-01-31 17:31:19 +01:00
Bart Visscher 12a900de25 Do setup default value handling in the controller not the template 2014-01-31 16:57:49 +01:00
Bart Visscher bca725dc32 Merge branch 'master' into setup
Conflicts:
	core/setup.php
2014-01-31 16:43:12 +01:00
Morris Jobke 09d2ba017e fix undefined $htaccessWorking 2013-10-07 00:36:42 +02:00
Bart Visscher 5db98aadd3 Copyright and small fix 2013-10-02 18:23:47 +02:00
Thomas Müller 071b8033cb fixing typo on $htaccessWorking - testing own code before pushing is appreciated 2013-09-24 00:44:55 +02:00
Bart Visscher 65aab3dc8c Check for failure in creating htaccessWorking testfile 2013-09-10 22:05:20 +02:00
Bart Visscher 8ae612f693 Move core setup code to controller class 2013-09-10 20:19:42 +02:00