Drop channel feature.

modules/features/video_user/video_user.features.field.inc

@@ -1340,79 +1340,12 @@ function video_user_field_default_fields() {
     ),
   );
 
-  // Exported field: 'user-user-group_audience'
-  $fields['user-user-group_audience'] = array(
-    'field_config' => array(
-      'active' => '1',
-      'cardinality' => '-1',
-      'deleted' => '0',
-      'entity_types' => array(),
-      'field_name' => 'group_audience',
-      'foreign keys' => array(),
-      'indexes' => array(
-        'gid' => array(
-          0 => 'gid',
-        ),
-      ),
-      'module' => 'og',
-      'no_ui' => TRUE,
-      'settings' => array(),
-      'translatable' => '0',
-      'type' => 'group',
-    ),
-    'field_instance' => array(
-      'bundle' => 'user',
-      'default_value' => NULL,
-      'deleted' => '0',
-      'description' => '',
-      'display' => array(
-        'default' => array(
-          'label' => 'hidden',
-          'module' => 'og',
-          'settings' => array(),
-          'type' => 'og_list_default',
-          'weight' => '11',
-        ),
-      ),
-      'entity_type' => 'user',
-      'field_name' => 'group_audience',
-      'label' => 'Channel',
-      'required' => 0,
-      'settings' => array(
-        'user_register_form' => 0,
-      ),
-      'view modes' => array(
-        'full' => array(
-          'custom settings' => FALSE,
-          'label' => 'Full',
-          'type' => 'og_list_default',
-        ),
-        'teaser' => array(
-          'custom settings' => FALSE,
-          'label' => 'Teaser',
-          'type' => 'og_list_default',
-        ),
-      ),
-      'widget' => array(
-        'active' => 1,
-        'module' => 'og',
-        'settings' => array(
-          'opt_group' => 'auto',
-        ),
-        'type' => 'group_audience',
-        'weight' => '1',
-      ),
-      'widget_type' => 'group_audience',
-    ),
-  );
-
   // Translatables
   // Included for use with string extractors like potx.
   t('About me');
   t('Activities');
   t('Birthday');
   t('Books');
-  t('Channel');
   t('Current location');
   t('Favourite Quotations');
   t('Favourite athletes');

modules/features/video_user/video_user.info

@@ -34,7 +34,6 @@ features[field][] = "user-user-field_name"
 features[field][] = "user-user-field_people_who_inspire_you"
 features[field][] = "user-user-field_religion"
 features[field][] = "user-user-field_television"
-features[field][] = "user-user-group_audience"
 features[field_group][] = "group_activities_and_interests|user|user|default"
 features[field_group][] = "group_activities_and_interests|user|user|form"
 features[field_group][] = "group_arts_and_entertainment|user|user|default"

modules/features/video_video/video_video.features.field.inc

@@ -372,82 +372,9 @@ function video_video_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-video-group_audience'
-  $fields['node-video-group_audience'] = array(
-    'field_config' => array(
-      'active' => '1',
-      'cardinality' => '-1',
-      'deleted' => '0',
-      'entity_types' => array(),
-      'field_name' => 'group_audience',
-      'foreign keys' => array(),
-      'indexes' => array(
-        'gid' => array(
-          0 => 'gid',
-        ),
-      ),
-      'module' => 'og',
-      'no_ui' => TRUE,
-      'settings' => array(),
-      'translatable' => '0',
-      'type' => 'group',
-    ),
-    'field_instance' => array(
-      'bundle' => 'video',
-      'default_value' => NULL,
-      'deleted' => '0',
-      'description' => 'Select the channel this content should be associated with.',
-      'display' => array(
-        'default' => array(
-          'label' => 'inline',
-          'module' => 'og',
-          'settings' => array(),
-          'type' => 'og_list_default',
-          'weight' => '5',
-        ),
-        'teaser' => array(
-          'label' => 'above',
-          'settings' => array(),
-          'type' => 'hidden',
-          'weight' => '0',
-        ),
-      ),
-      'entity_type' => 'node',
-      'field_name' => 'group_audience',
-      'label' => 'Channel',
-      'required' => 0,
-      'settings' => array(
-        'user_register_form' => FALSE,
-      ),
-      'view modes' => array(
-        'full' => array(
-          'custom settings' => FALSE,
-          'label' => 'Full',
-          'type' => 'og_list_default',
-        ),
-        'teaser' => array(
-          'custom settings' => FALSE,
-          'label' => 'Teaser',
-          'type' => 'og_list_default',
-        ),
-      ),
-      'widget' => array(
-        'active' => 1,
-        'module' => 'og',
-        'settings' => array(
-          'opt_group' => 'auto',
-        ),
-        'type' => 'group_audience',
-        'weight' => '3',
-      ),
-      'widget_type' => 'group_audience',
-    ),
-  );
-
   // Translatables
   // Included for use with string extractors like potx.
   t('Category');
-  t('Channel');
   t('Description');
   t('Rate');
   t('Select the channel this content should be associated with.');

modules/features/video_video/video_video.info

@@ -30,7 +30,6 @@ features[field][] = "node-video-field_category"
 features[field][] = "node-video-field_fivestar"
 features[field][] = "node-video-field_tags"
 features[field][] = "node-video-field_video"
-features[field][] = "node-video-group_audience"
 features[field_group][] = "group_categories|node|video|form"
 features[field_group][] = "group_channel|node|video|form"
 features[field_group][] = "group_description|node|video|form"

octopus_video.info

@@ -40,7 +40,6 @@ dependencies[] = libraries
 dependencies[] = list
 dependencies[] = logintoboggan
 dependencies[] = logintoboggan_rules
-; dependencies[] = og
 dependencies[] = page_manager
 dependencies[] = panels
 dependencies[] = pathauto
@@ -62,9 +61,9 @@ dependencies[] = zencoderapi
 
 ; Features
 dependencies[]  = video_core
-; dependencies[]  = video_video
-; dependencies[]  = video_flags
-; dependencies[]  = video_user
+dependencies[]  = video_video
+dependencies[]  = video_flags
+dependencies[]  = video_user
 
 ; custom
 ; dependencies[] = octopus_helper