Merge "Fix missing og_groups_ref fields from group contents"

groups.info

@@ -109,6 +109,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
@@ -121,7 +122,6 @@ dependencies[] = commons_wysiwyg
 ;dependencies[] = commons_site_homepage
 ;dependencies[] = commons_trusted_contacts
 ;dependencies[] = commons_user_profile_pages
-;dependencies[] = commons_wikis
 ;dependencies[] = commons_wikis_pages
 
 ; Install Groups dependencies

groups.install

@@ -134,6 +134,17 @@ function groups_update_7102() {
   module_enable(array('groups_events_pages'));
 }
 
+/**
+ * Enable commons_wikis module to fix missing og_group_ref
+ * fields from group contents.
+ */
+function groups_update_7103() {
+  if (!module_exists('commons_wikis')) {
+    module_enable(array('commons_wikis'));
+    drupal_flush_all_caches();
+  }
+}
+
 /**
  * Add markdown filter with permissions.
  */

groups.profile

@@ -5,6 +5,20 @@
  */
 define('DRUPAL_MINIMUM_MAX_EXECUTION_TIME', 120);
 
+/**
+ * Implements hook_hook_info().
+ *
+ * Provide commons_entity_integration hooks, load hooks from
+ * modulename.commons.inc file.
+ */
+function groups_hook_info() {
+  $hooks = array(
+    'commons_entity_integration',
+    'commons_entity_integration_alter',
+  );
+  return array_fill_keys($hooks, array('group' => 'commons'));
+}
+
 /**
  * Get Commons entity integration information.
  *