Commit 4323892e authored by omega8cc's avatar omega8cc

Merge remote-tracking branch 'origin/6.x-2.x' into 2.3.x-dev

parents 6939a571 dffa256a
...@@ -44,21 +44,23 @@ function _provision_platform_drupal_deploy_7_replace($old_url, $new_url) { ...@@ -44,21 +44,23 @@ function _provision_platform_drupal_deploy_7_replace($old_url, $new_url) {
} }
db_query("UPDATE {system} SET filename = REPLACE(filename, :old, :new)", $replace_patterns); db_query("UPDATE {system} SET filename = REPLACE(filename, :old, :new)", $replace_patterns);
$field_map = field_info_field_map(); if (function_exists('field_info_field_map')) {
foreach ($field_map as $key => $info) { $field_map = field_info_field_map();
$tablekey = db_escape_table($key); foreach ($field_map as $key => $info) {
// Replace in all known text fields. $tablekey = db_escape_table($key);
if (in_array($info['type'], array('text_long', 'text_with_summary'))) { // Replace in all known text fields.
drush_log('Replacing in ' . $key, 'debug'); if (in_array($info['type'], array('text_long', 'text_with_summary'))) {
db_query("UPDATE {field_data_${tablekey}} SET ${tablekey}_value = REPLACE(${tablekey}_value, :old, :new)", $replace_patterns); drush_log('Replacing in ' . $key, 'debug');
db_query("UPDATE {field_revision_${tablekey}} SET ${tablekey}_value = REPLACE(${tablekey}_value, :old, :new)", $replace_patterns); db_query("UPDATE {field_data_${tablekey}} SET ${tablekey}_value = REPLACE(${tablekey}_value, :old, :new)", $replace_patterns);
} db_query("UPDATE {field_revision_${tablekey}} SET ${tablekey}_value = REPLACE(${tablekey}_value, :old, :new)", $replace_patterns);
}
// Replace in the optional summary. // Replace in the optional summary.
if ($info['type'] == 'text_with_summary') { if ($info['type'] == 'text_with_summary') {
drush_log('Replacing summary in ' . $key, 'debug'); drush_log('Replacing summary in ' . $key, 'debug');
db_query("UPDATE {field_data_${tablekey}} SET ${tablekey}_summary = REPLACE(${tablekey}_summary, :old, :new)", $replace_patterns); db_query("UPDATE {field_data_${tablekey}} SET ${tablekey}_summary = REPLACE(${tablekey}_summary, :old, :new)", $replace_patterns);
db_query("UPDATE {field_revision_${tablekey}} SET ${tablekey}_summary = REPLACE(${tablekey}_summary, :old, :new)", $replace_patterns); db_query("UPDATE {field_revision_${tablekey}} SET ${tablekey}_summary = REPLACE(${tablekey}_summary, :old, :new)", $replace_patterns);
}
} }
} }
drush_log( drush_log(
......
...@@ -141,6 +141,10 @@ function install_main() { ...@@ -141,6 +141,10 @@ function install_main() {
), ),
), ),
); );
// Allow other commands to alter the installation settings.
drush_command_invoke_all_ref('provision_drupal_install_settings_alter', $settings, $url);
try { try {
install_drupal($settings); install_drupal($settings);
} }
......
...@@ -212,3 +212,16 @@ function hook_provision_drupal_chgrp_directories_alter(&$chgrp, $url) { ...@@ -212,3 +212,16 @@ function hook_provision_drupal_chgrp_directories_alter(&$chgrp, $url) {
$chgrp["sites/$url/my_special_dir"] = d('@server_master')->web_group; $chgrp["sites/$url/my_special_dir"] = d('@server_master')->web_group;
$chgrp["sites/$url/my_other_dir"] = FALSE; // Skip the chgrp on this directory. $chgrp["sites/$url/my_other_dir"] = FALSE; // Skip the chgrp on this directory.
} }
/**
* Alter the settings array just before starting the provision install.
*
* @param $settings
* The array with settings.
* @param $url
* The site url.
*/
function hook_provision_drupal_install_settings_alter(&$settings, $url) {
$settings['forms']['install_configure_form']['update_status_module'] = array();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment