Commit 7ae5bb93 authored by Annesley Newholm's avatar Annesley Newholm

removed full_html filter conflict

parent 7107739d
......@@ -10,7 +10,6 @@
function suggested_event_defaultconfig_features() {
return array(
'suggested_event' => array(
'default_mollom_form' => 'default_mollom_form',
'field_default_fields' => 'field_default_fields',
'panelizer_defaults' => 'panelizer_defaults',
'strongarm' => 'strongarm',
......@@ -19,38 +18,6 @@ function suggested_event_defaultconfig_features() {
);
}
/**
* Implements hook_defaultconfig_default_mollom_form().
*/
function suggested_event_defaultconfig_default_mollom_form() {
$export = array();
$mollom_form = new stdClass();
$mollom_form->disabled = FALSE; /* Edit this to true to make a default mollom_form disabled initially */
$mollom_form->api_version = 1;
$mollom_form->form_id = 'event_suggestion_node_form';
$mollom_form->entity = 'node';
$mollom_form->bundle = 'event_suggestion';
$mollom_form->mode = 2;
$mollom_form->checks = array(
0 => 'spam',
);
$mollom_form->unsure = 'captcha';
$mollom_form->discard = FALSE;
$mollom_form->moderation = FALSE;
$mollom_form->enabled_fields = array(
0 => 'title',
1 => 'body',
2 => 'field_oa_address',
3 => 'field_user_display_name',
);
$mollom_form->strictness = 'normal';
$mollom_form->module = 'node';
$export['event_suggestion_node_form'] = $mollom_form;
return $export;
}
/**
* Implements hook_defaultconfig_field_default_fields().
*/
......
......@@ -32,7 +32,6 @@ features[ctools][] = page_manager:pages_default:1
features[ctools][] = pm_existing_pages:pm_existing_pages:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[defaultconfig][] = default_mollom_form:event_suggestion_node_form
features[defaultconfig][] = field_default_fields:node-event_suggestion-body
features[defaultconfig][] = field_default_fields:node-event_suggestion-field_event_language_s_
features[defaultconfig][] = field_default_fields:node-event_suggestion-field_oa_address
......@@ -74,7 +73,6 @@ features[field_instance][] = node-event_suggestion-field_oa_date
features[field_instance][] = node-event_suggestion-field_suggested_section
features[field_instance][] = node-event_suggestion-field_suggested_space
features[field_instance][] = node-event_suggestion-field_user_display_name
features[filter][] = full_html
features[mollom_form][] = event_suggestion_node_form
features[node][] = event_suggestion
features[node_convert_templates][] = publish_event_suggestion
......@@ -111,3 +109,4 @@ features_exclude[dependencies][features] = features
features_exclude[dependencies][og] = og
features_exclude[dependencies][strongarm] = strongarm
features_exclude[dependencies][taxonomy] = taxonomy
features_exclude[filter][full_html] = full_html
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