Feature re-exported for flagging table names

Gizra · Jun 3, 2016 · aa570f0 · aa570f0
1 parent 5feb3d5
commit aa570f0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 48 deletions.
diff --git a/message_subscribe.info b/message_subscribe.info
@@ -2,7 +2,6 @@ name = Message subscribe
 description = Subscribe API for the Message and Message notify modules.
 core = 7.x
 package = Message
-php = 5.2.4
 project = message_subscribe
 dependencies[] = ctools
 dependencies[] = flag

diff --git a/message_subscribe_ui/message_subscribe_ui.features.inc b/message_subscribe_ui/message_subscribe_ui.features.inc
@@ -7,6 +7,6 @@
 /**
  * Implements hook_views_api().
  */
-function message_subscribe_ui_views_api() {
-  return array("version" => "3.0");
+function message_subscribe_ui_views_api($module = NULL, $api = NULL) {
+  return array("api" => "3.0");
 }
diff --git a/message_subscribe_ui/message_subscribe_ui.info b/message_subscribe_ui/message_subscribe_ui.info
@@ -2,14 +2,12 @@ name = Message subscribe UI
 description = Message subscribe UI
 core = 7.x
 package = Message
-php = 5.2.4
-version = 7.x-1.0
 project = message_subscribe
 dependencies[] = message_subscribe
 dependencies[] = views
 dependencies[] = views_content
 features[ctools][] = views:views_default:3.0
-features[features_api][] = api:1
+features[features_api][] = api:2
 features[views_view][] = subscribe_node
 features[views_view][] = subscribe_taxonomy_term
 features[views_view][] = subscribe_user
diff --git a/message_subscribe_ui/message_subscribe_ui.views_default.inc b/message_subscribe_ui/message_subscribe_ui.views_default.inc
@@ -71,7 +71,7 @@ function message_subscribe_ui_views_default_views() {
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   /* Field: Flags: Flag link */
   $handler->display->display_options['fields']['ops']['id'] = 'ops';
-  $handler->display->display_options['fields']['ops']['table'] = 'flag_content';
+  $handler->display->display_options['fields']['ops']['table'] = 'flagging';
   $handler->display->display_options['fields']['ops']['field'] = 'ops';
   $handler->display->display_options['fields']['ops']['relationship'] = 'flag_content_rel';
   $handler->display->display_options['fields']['ops']['label'] = '';
@@ -83,7 +83,7 @@ function message_subscribe_ui_views_default_views() {
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
   /* Contextual filter: Flags: User uid */
   $handler->display->display_options['arguments']['uid']['id'] = 'uid';
-  $handler->display->display_options['arguments']['uid']['table'] = 'flag_content';
+  $handler->display->display_options['arguments']['uid']['table'] = 'flagging';
   $handler->display->display_options['arguments']['uid']['field'] = 'uid';
   $handler->display->display_options['arguments']['uid']['relationship'] = 'flag_content_rel';
   $handler->display->display_options['arguments']['uid']['default_action'] = 'not found';
@@ -98,18 +98,6 @@ function message_subscribe_ui_views_default_views() {
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  $translatables['subscribe_node'] = array(
-    t('Master'),
-    t('more'),
-    t('Apply'),
-    t('Reset'),
-    t('Sort by'),
-    t('Asc'),
-    t('Desc'),
-    t('You are not subscribed to any item.'),
-    t('flag'),
-    t('All'),
-  );
   $export['subscribe_node'] = $view;
 
   $view = new view();
@@ -168,33 +156,21 @@ function message_subscribe_ui_views_default_views() {
   $handler->display->display_options['fields']['name']['link_to_taxonomy'] = TRUE;
   /* Field: Flags: Flag link */
   $handler->display->display_options['fields']['ops']['id'] = 'ops';
-  $handler->display->display_options['fields']['ops']['table'] = 'flag_content';
+  $handler->display->display_options['fields']['ops']['table'] = 'flagging';
   $handler->display->display_options['fields']['ops']['field'] = 'ops';
   $handler->display->display_options['fields']['ops']['relationship'] = 'flag_content_rel';
   $handler->display->display_options['fields']['ops']['label'] = '';
   $handler->display->display_options['fields']['ops']['element_label_colon'] = FALSE;
   /* Contextual filter: Flags: User uid */
   $handler->display->display_options['arguments']['uid']['id'] = 'uid';
-  $handler->display->display_options['arguments']['uid']['table'] = 'flag_content';
+  $handler->display->display_options['arguments']['uid']['table'] = 'flagging';
   $handler->display->display_options['arguments']['uid']['field'] = 'uid';
   $handler->display->display_options['arguments']['uid']['relationship'] = 'flag_content_rel';
   $handler->display->display_options['arguments']['uid']['default_action'] = 'not found';
   $handler->display->display_options['arguments']['uid']['default_argument_type'] = 'fixed';
   $handler->display->display_options['arguments']['uid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['uid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['uid']['summary_options']['items_per_page'] = '25';
-  $translatables['subscribe_taxonomy_term'] = array(
-    t('Master'),
-    t('more'),
-    t('Apply'),
-    t('Reset'),
-    t('Sort by'),
-    t('Asc'),
-    t('Desc'),
-    t('You are not subscribed to any item.'),
-    t('flag'),
-    t('All'),
-  );
   $export['subscribe_taxonomy_term'] = $view;
 
   $view = new view();
@@ -253,7 +229,7 @@ function message_subscribe_ui_views_default_views() {
   $handler->display->display_options['fields']['name']['alter']['ellipsis'] = FALSE;
   /* Field: Flags: Flag link */
   $handler->display->display_options['fields']['ops']['id'] = 'ops';
-  $handler->display->display_options['fields']['ops']['table'] = 'flag_content';
+  $handler->display->display_options['fields']['ops']['table'] = 'flagging';
   $handler->display->display_options['fields']['ops']['field'] = 'ops';
   $handler->display->display_options['fields']['ops']['relationship'] = 'flag_content_rel';
   $handler->display->display_options['fields']['ops']['label'] = '';
@@ -265,7 +241,7 @@ function message_subscribe_ui_views_default_views() {
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
   /* Contextual filter: Flags: User uid */
   $handler->display->display_options['arguments']['uid']['id'] = 'uid';
-  $handler->display->display_options['arguments']['uid']['table'] = 'flag_content';
+  $handler->display->display_options['arguments']['uid']['table'] = 'flagging';
   $handler->display->display_options['arguments']['uid']['field'] = 'uid';
   $handler->display->display_options['arguments']['uid']['relationship'] = 'flag_content_rel';
   $handler->display->display_options['arguments']['uid']['default_action'] = 'not found';
@@ -280,18 +256,6 @@ function message_subscribe_ui_views_default_views() {
   $handler->display->display_options['filters']['status']['value'] = '1';
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  $translatables['subscribe_user'] = array(
-    t('Master'),
-    t('more'),
-    t('Apply'),
-    t('Reset'),
-    t('Sort by'),
-    t('Asc'),
-    t('Desc'),
-    t('You are not subscribed to any item.'),
-    t('flag'),
-    t('All'),
-  );
   $export['subscribe_user'] = $view;
 
   return $export;