diff --git a/drupal_commons.make b/drupal_commons.make index a9dc6c0..27ec4da 100644 --- a/drupal_commons.make +++ b/drupal_commons.make @@ -59,7 +59,12 @@ projects[date][subdir] = "contrib" projects[date][version] = "2.7" projects[diff][subdir] = "contrib" +projects[diff][download][type] = "git" +projects[diff][download][url] = "http://git.drupal.org/project/diff.git" +projects[diff][download][revision] = "6.x-2.x" +; http://drupal.org/node/372957#comment-5458068 +projects[diff][patch][] = "http://drupal.org/files/372957-diff-strip-html-73.patch" projects[tagging][subdir] = "contrib" diff --git a/modules/features/commons_blog/commons_blog.info b/modules/features/commons_blog/commons_blog.info index 8ce5f0a..023f56a 100644 --- a/modules/features/commons_blog/commons_blog.info +++ b/modules/features/commons_blog/commons_blog.info @@ -41,6 +41,7 @@ features[variable][] = "comment_preview_blog" features[variable][] = "content_extra_weights_blog" features[variable][] = "node_options_blog" features[variable][] = "og_content_type_usage_blog" +features[variable][] = "remove_markup_default_blog" features[views][] = "blog_latest_comments" features[views][] = "content_blog_page" features[views][] = "group_block_blog_latest" diff --git a/modules/features/commons_blog/commons_blog.strongarm.inc b/modules/features/commons_blog/commons_blog.strongarm.inc index c0a841b..d69edc1 100644 --- a/modules/features/commons_blog/commons_blog.strongarm.inc +++ b/modules/features/commons_blog/commons_blog.strongarm.inc @@ -89,5 +89,12 @@ function commons_blog_strongarm() { $strongarm->value = 'group_post_standard'; $export['og_content_type_usage_blog'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'remove_markup_default_blog'; + $strongarm->value = 1; + + $export['remove_markup_default_blog'] = $strongarm; return $export; } diff --git a/modules/features/commons_core/commons_core.info b/modules/features/commons_core/commons_core.info index 37f6687..fdb1764 100644 --- a/modules/features/commons_core/commons_core.info +++ b/modules/features/commons_core/commons_core.info @@ -204,6 +204,9 @@ features[variable][] = "og_home_page_view" features[variable][] = "og_private_groups" features[variable][] = "og_statistics_include_unapproved_members" features[variable][] = "og_visibility" +features[variable][] = "remove_markup_default_group" +features[variable][] = "remove_markup_default_notice" +features[variable][] = "remove_markup_default_page" features[variable][] = "quant_height" features[variable][] = "quant_width" features[variable][] = "tagadelic_block_tags_1" diff --git a/modules/features/commons_core/commons_core.strongarm.inc b/modules/features/commons_core/commons_core.strongarm.inc index 89957d7..27a68f0 100644 --- a/modules/features/commons_core/commons_core.strongarm.inc +++ b/modules/features/commons_core/commons_core.strongarm.inc @@ -187,6 +187,27 @@ function commons_core_strongarm() { $strongarm->name = 'og_visibility'; $strongarm->value = '2'; $export['og_visibility'] = $strongarm; + + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'remove_markup_default_group'; + $strongarm->value = 1; + $export['remove_markup_default_group'] = $strongarm; + + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'remove_markup_default_notice'; + $strongarm->value = 1; + $export['remove_markup_default_notice'] = $strongarm; + + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'remove_markup_default_page'; + $strongarm->value = 1; + $export['remove_markup_default_page'] = $strongarm; $strongarm = new stdClass; $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ diff --git a/modules/features/commons_discussion/commons_discussion.info b/modules/features/commons_discussion/commons_discussion.info index 9086bc7..974717b 100644 --- a/modules/features/commons_discussion/commons_discussion.info +++ b/modules/features/commons_discussion/commons_discussion.info @@ -42,6 +42,7 @@ features[variable][] = "comment_subject_field_discussion" features[variable][] = "content_extra_weights_discussion" features[variable][] = "node_options_discussion" features[variable][] = "og_content_type_usage_discussion" +features[variable][] = "remove_markup_default_discussion" features[views][] = "content_discussion_page" features[views][] = "discussion_latest_comments" features[views][] = "group_block_disc_latest_comments" diff --git a/modules/features/commons_discussion/commons_discussion.strongarm.inc b/modules/features/commons_discussion/commons_discussion.strongarm.inc index b62dc89..735836a 100644 --- a/modules/features/commons_discussion/commons_discussion.strongarm.inc +++ b/modules/features/commons_discussion/commons_discussion.strongarm.inc @@ -104,5 +104,12 @@ function commons_discussion_strongarm() { $strongarm->value = 'group_post_standard'; $export['og_content_type_usage_discussion'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'remove_markup_default_discussion'; + $strongarm->value = 1; + + $export['remove_markup_default_discussion'] = $strongarm; return $export; } diff --git a/modules/features/commons_document/commons_document.info b/modules/features/commons_document/commons_document.info index 87d613f..3984368 100644 --- a/modules/features/commons_document/commons_document.info +++ b/modules/features/commons_document/commons_document.info @@ -48,6 +48,7 @@ features[variable][] = "comment_subject_field_document" features[variable][] = "content_extra_weights_document" features[variable][] = "node_options_document" features[variable][] = "og_content_type_usage_document" +features[variable][] = "remove_markup_default_document" features[views][] = "content_document_page" features[views][] = "document_latest_comments" features[views][] = "group_block_doc_latest_comments" diff --git a/modules/features/commons_document/commons_document.strongarm.inc b/modules/features/commons_document/commons_document.strongarm.inc index 2a94e8c..60f6953 100644 --- a/modules/features/commons_document/commons_document.strongarm.inc +++ b/modules/features/commons_document/commons_document.strongarm.inc @@ -103,5 +103,12 @@ function commons_document_strongarm() { $strongarm->value = 'group_post_standard'; $export['og_content_type_usage_document'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'remove_markup_default_document'; + $strongarm->value = 1; + + $export['remove_markup_default_document'] = $strongarm; return $export; } diff --git a/modules/features/commons_event/commons_event.info b/modules/features/commons_event/commons_event.info index b13a79e..928d166 100644 --- a/modules/features/commons_event/commons_event.info +++ b/modules/features/commons_event/commons_event.info @@ -63,6 +63,7 @@ features[variable][] = "comment_subject_field_event" features[variable][] = "content_extra_weights_event" features[variable][] = "node_options_event" features[variable][] = "og_content_type_usage_event" +features[variable][] = "remove_markup_default_event" features[views][] = "content_event_calendar" features[views][] = "content_event_page" features[views][] = "event_latest" diff --git a/modules/features/commons_event/commons_event.strongarm.inc b/modules/features/commons_event/commons_event.strongarm.inc index 94bc4bb..25a3588 100644 --- a/modules/features/commons_event/commons_event.strongarm.inc +++ b/modules/features/commons_event/commons_event.strongarm.inc @@ -104,6 +104,12 @@ function commons_event_strongarm() { $strongarm->name = 'og_content_type_usage_event'; $strongarm->value = 'group_post_standard'; $export['og_content_type_usage_event'] = $strongarm; - + + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'remove_markup_default_event'; + $strongarm->value = 1; + $export['remove_markup_default_event'] = $strongarm; return $export; } diff --git a/modules/features/commons_poll/commons_poll.info b/modules/features/commons_poll/commons_poll.info index c249b18..ba92d7a 100644 --- a/modules/features/commons_poll/commons_poll.info +++ b/modules/features/commons_poll/commons_poll.info @@ -48,6 +48,7 @@ features[variable][] = "comment_subject_field_poll" features[variable][] = "content_extra_weights_poll" features[variable][] = "node_options_poll" features[variable][] = "og_content_type_usage_poll" +features[variable][] = "remove_markup_default_poll" features[views][] = "content_poll_page" features[views][] = "group_block_poll_latest" features[views][] = "group_block_poll_latest_comments" diff --git a/modules/features/commons_poll/commons_poll.strongarm.inc b/modules/features/commons_poll/commons_poll.strongarm.inc index 98a95d3..c61352a 100644 --- a/modules/features/commons_poll/commons_poll.strongarm.inc +++ b/modules/features/commons_poll/commons_poll.strongarm.inc @@ -105,5 +105,13 @@ function commons_poll_strongarm() { $strongarm->value = 'group_post_standard'; $export['og_content_type_usage_poll'] = $strongarm; + + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'remove_markup_default_poll'; + $strongarm->value = 1; + + $export['remove_markup_default_poll'] = $strongarm; return $export; } diff --git a/modules/features/commons_wiki/commons_wiki.info b/modules/features/commons_wiki/commons_wiki.info index 6816787..ab59c69 100644 --- a/modules/features/commons_wiki/commons_wiki.info +++ b/modules/features/commons_wiki/commons_wiki.info @@ -53,6 +53,7 @@ features[variable][] = "freelinking_onceonly" features[variable][] = "freelinking_restriction" features[variable][] = "node_options_wiki" features[variable][] = "og_content_type_usage_wiki" +features[variable][] = "remove_markup_default_wiki" features[variable][] = "wikitools_404_type" features[variable][] = "wikitools_disallowed_characters" features[variable][] = "wikitools_main_page_title" diff --git a/modules/features/commons_wiki/commons_wiki.strongarm.inc b/modules/features/commons_wiki/commons_wiki.strongarm.inc index 791d998..55861af 100644 --- a/modules/features/commons_wiki/commons_wiki.strongarm.inc +++ b/modules/features/commons_wiki/commons_wiki.strongarm.inc @@ -145,6 +145,13 @@ function commons_wiki_strongarm() { $strongarm = new stdClass; $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; + $strongarm->name = 'remove_markup_default_wiki'; + $strongarm->value = 1; + + $export['remove_markup_default_wiki'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; $strongarm->name = 'wikitools_404_type'; $strongarm->value = array( 'Link to creation' => 'Link to creation',