Commit 5a2326ba authored by Brad Blake's avatar Brad Blake
Browse files

Issue #1484530 by Alexander Allen: Don't export comment variables unless comment.module is enabled.

parent 51369666
......@@ -193,16 +193,21 @@ function variable_features_export_render($module, $data) {
*/
function strongarm_features_pipe_node_alter(&$pipe, $data, $export) {
if (!empty($data)) {
$variables = array(
'comment',
'comment_anonymous',
'comment_controls',
'comment_default_mode',
'comment_default_order',
'comment_default_per_page',
'comment_form_location',
'comment_preview',
'comment_subject_field',
$variables = array();
if (module_exists('comment')) {
$variables = array(
'comment',
'comment_anonymous',
'comment_controls',
'comment_default_mode',
'comment_default_order',
'comment_default_per_page',
'comment_form_location',
'comment_preview',
'comment_subject_field',
);
}
$variables = array_merge($variables, array(
'field_bundle_settings_node_',
'language_content_type',
'menu_options',
......@@ -210,7 +215,7 @@ function strongarm_features_pipe_node_alter(&$pipe, $data, $export) {
'node_options',
'node_preview',
'node_submitted',
);
));
foreach ($data as $node_type) {
foreach ($variables as $variable_name) {
$pipe['variable'][] = "{$variable_name}_{$node_type}";
......
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