0a1,11 > From a8c367a43fb977264501948d1154457fd1c16f2d Mon Sep 17 00:00:00 2001 > From: Bram Goffings > Date: Thu, 12 Jul 2012 09:49:27 +0200 > Subject: [PATCH] config installer > > --- > core/includes/install.core.inc | 39 +++---------------------------- > core/includes/install.inc | 52 ++++++++++++++++++++++++++++++++++++++++++ > core/includes/update.inc | 34 ++++++++++++++++++++++++++- > 3 files changed, 88 insertions(+), 37 deletions(-) > 2c13 < index c145cc7..94d2754 100644 --- > index 32ce838..889dbe2 100644 5c16 < @@ -899,23 +899,6 @@ function install_verify_pdo() { --- > @@ -900,23 +900,6 @@ function install_verify_pdo() { 29c40 < @@ -1050,7 +1033,7 @@ function install_database_errors($database, $settings_file) { --- > @@ -1051,7 +1034,7 @@ function install_database_errors($database, $settings_file) { 38c49 < @@ -1062,26 +1045,10 @@ function install_settings_form_submit($form, &$form_state) { --- > @@ -1063,26 +1046,10 @@ function install_settings_form_submit($form, &$form_state) { 68c79 < index cd67257..e5dc383 100644 --- > index 41d244a..3f89516 100644 71c82 < @@ -249,6 +249,58 @@ function drupal_rewrite_settings($settings = array()) { --- > @@ -248,6 +248,58 @@ function drupal_rewrite_settings($settings = array()) { 131c142 < index ab373cd..9b47a6a 100644 --- > index f5e7a5e..acfc0d5 100644 134c145 < @@ -88,6 +88,31 @@ function update_prepare_d8_bootstrap() { --- > @@ -88,6 +88,30 @@ function update_prepare_d8_bootstrap() { 139,140c150 < + $settings_exist = TRUE; < + $settings_exist = $settings_exist && !empty($GLOBALS['config_directory_name']); --- > + $settings_exist = !empty($GLOBALS['config_directory_name']); 166c176 < @@ -99,10 +124,12 @@ function update_prepare_d8_bootstrap() { --- > @@ -99,10 +123,12 @@ function update_prepare_d8_bootstrap() { 180c190 < @@ -113,6 +140,12 @@ function update_prepare_d8_bootstrap() { --- > @@ -113,6 +139,12 @@ function update_prepare_d8_bootstrap() { 192a203,205 > -- > 1.7.11.msysgit.1 >