From 375cd6749cb3d58107ec9bd197dbb4b5f912a44e Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Thu, 22 Oct 2015 17:03:41 -0400
Subject: [PATCH] daily build 2

---
 .../modules/custom/ocio_web_form/ocio_web_form.info  |  2 +-
 .../custom/ocio_web_form/ocio_web_form.strongarm.inc | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.info b/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.info
index 6cb2a77a..c94a903e 100644
--- a/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.info
+++ b/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.info
@@ -29,8 +29,8 @@ features[variable][] = node_preview_web_form
 features[variable][] = node_submitted_web_form
 features[variable][] = private_web_form
 features[variable][] = webform_default_format
-features[variable][] = webform_email_address_individual
 features[variable][] = webform_email_html_capable
+features[variable][] = webform_format_override
 features[variable][] = webform_node_web_form
 features[variable][] = workbench_moderation_default_state_web_form
 features_exclude[field_base][body] = body
diff --git a/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.strongarm.inc
index fa263d96..e4d04e7c 100644
--- a/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.strongarm.inc
@@ -136,16 +136,16 @@ function ocio_web_form_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
-  $strongarm->name = 'webform_email_address_individual';
-  $strongarm->value = '0';
-  $export['webform_email_address_individual'] = $strongarm;
+  $strongarm->name = 'webform_email_html_capable';
+  $strongarm->value = 1;
+  $export['webform_email_html_capable'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
-  $strongarm->name = 'webform_email_html_capable';
-  $strongarm->value = 1;
-  $export['webform_email_html_capable'] = $strongarm;
+  $strongarm->name = 'webform_format_override';
+  $strongarm->value = '1';
+  $export['webform_format_override'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-- 
GitLab