Eileen has uploaded a new change for review. https://gerrit.wikimedia.org/r/243028
Change subject: CRM-17322 output upgrade as text ...................................................................... CRM-17322 output upgrade as text This is an amended version of https://gerrit.wikimedia.org/r/#/c/242828 as core team suggested this way if would be available to Wordpress cli too Change-Id: I4980831b10b4ae67c5a416dd993c543b2b8c75a1 --- M CRM/Upgrade/Headless.php M drupal/drush/civicrm.drush.inc 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm refs/changes/28/243028/1 diff --git a/CRM/Upgrade/Headless.php b/CRM/Upgrade/Headless.php index 7e0cc13..07b58b2 100644 --- a/CRM/Upgrade/Headless.php +++ b/CRM/Upgrade/Headless.php @@ -76,9 +76,11 @@ CRM_Upgrade_Form::doFinish(); + $message = file_get_contents($postUpgradeMessageFile); return array( 'latestVer' => $latestVer, - 'message' => file_get_contents($postUpgradeMessageFile), + 'message' => $message, + 'text' => CRM_Utils_String::htmlToText($message), ); } diff --git a/drupal/drush/civicrm.drush.inc b/drupal/drush/civicrm.drush.inc index 3b81977..cbc4ee3 100644 --- a/drupal/drush/civicrm.drush.inc +++ b/drupal/drush/civicrm.drush.inc @@ -693,7 +693,7 @@ $upgradeHeadless = new CRM_Upgrade_Headless(); // FIXME Exception handling? $result = $upgradeHeadless->run(); - drush_print("Upgrade outputs: " . "\"" . $result['message'] . "\""); + drush_print("Upgrade outputs:\n" . $result['text']); } else { require_once 'CRM/Core/Smarty.php'; -- To view, visit https://gerrit.wikimedia.org/r/243028 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4980831b10b4ae67c5a416dd993c543b2b8c75a1 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm/civicrm Gerrit-Branch: civi-4.6.9 Gerrit-Owner: Eileen <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
