From e558f12530fc5de2fb0b2999dcf33e28247b9433 Mon Sep 17 00:00:00 2001 From: Marton Kiss Date: Tue, 6 Jan 2015 20:09:58 +0100 Subject: [PATCH] Fix the commons wikis module removal issues This fix overrides the commons wiki hooks instead of totally disable of the module. Simple module removal introduced some drush build errors in a special case when the distro was built from scratch. So the commons_wiki module now re-enabled and groups_wikis module remove the wikis entry from quicktabs and removes the permissions from wiki content type. Change-Id: Id65cc82e6caf92f494714e1592f8e958a352be4f --- groups.info | 4 +++- groups.install | 13 ++++++++++++ modules/groups/groups_wikis/groups_wikis.info | 16 +++++++++++++++ .../groups/groups_wikis/groups_wikis.module | 20 +++++++++++++++++++ 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 modules/groups/groups_wikis/groups_wikis.info create mode 100644 modules/groups/groups_wikis/groups_wikis.module diff --git a/groups.info b/groups.info index d2fe230..c620625 100644 --- a/groups.info +++ b/groups.info @@ -110,6 +110,7 @@ dependencies[] = commons_search dependencies[] = commons_search_core dependencies[] = commons_social_sharing dependencies[] = commons_utility_links +dependencies[] = commons_wikis dependencies[] = commons_wysiwyg ; Disabled commons modules @@ -157,4 +158,5 @@ dependencies[] = groups_oauth2_picture dependencies[] = groups_feeds dependencies[] = groups_events dependencies[] = groups_events_pages -dependencies[] = groups_pages \ No newline at end of file +dependencies[] = groups_pages +dependencies[] = groups_wikis \ No newline at end of file diff --git a/groups.install b/groups.install index 8575326..535a663 100644 --- a/groups.install +++ b/groups.install @@ -211,6 +211,19 @@ function groups_update_7110() { } } +/** + * Re-enable commons_wikis and enable groups_wikis module. + */ +function groups_update_7111() { + if (!module_exists('commons_wikis')) { + module_enable(array('commons_wikis')); + } + if (!module_exists('groups_wikis')) { + module_enable(array('groups_wikis')); + } + drupal_flush_all_caches(); +} + /** * Add markdown filter with permissions. */ diff --git a/modules/groups/groups_wikis/groups_wikis.info b/modules/groups/groups_wikis/groups_wikis.info new file mode 100644 index 0000000..1f54126 --- /dev/null +++ b/modules/groups/groups_wikis/groups_wikis.info @@ -0,0 +1,16 @@ +name = Groups Wikis +description = Disable the Drupal Commons Wikis for Groups portal +core = 7.x +package = groups +version = 7.x-1.0 +project = groups_wikis +dependencies[] = commons_groups +dependencies[] = features +dependencies[] = field_group_location +dependencies[] = field_property_list +dependencies[] = geocoder +dependencies[] = geofield +dependencies[] = list +dependencies[] = options +dependencies[] = groups_common +dependencies[] = commons_wikis \ No newline at end of file diff --git a/modules/groups/groups_wikis/groups_wikis.module b/modules/groups/groups_wikis/groups_wikis.module new file mode 100644 index 0000000..5005013 --- /dev/null +++ b/modules/groups/groups_wikis/groups_wikis.module @@ -0,0 +1,20 @@ +