diff --git a/modules/commons/commons_activity_streams/commons_activity_page/commons_activity_page.features.inc b/modules/commons/commons_activity_streams/commons_activity_page/commons_activity_page.features.inc index 642967fe9caecf9f92c7e0b5f39678c94235bfd1..05903a2ef54fa262cddddc8adb83ce3a6804b9b8 100644 --- a/modules/commons/commons_activity_streams/commons_activity_page/commons_activity_page.features.inc +++ b/modules/commons/commons_activity_streams/commons_activity_page/commons_activity_page.features.inc @@ -7,8 +7,7 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_activity_page_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_activity_page_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "page_manager" && $api == "pages_default") { return array("version" => "1"); } diff --git a/modules/commons/commons_activity_streams/commons_activity_page/commons_activity_page.info b/modules/commons/commons_activity_streams/commons_activity_page/commons_activity_page.info index b6aa31d1f3da39508686885d8e5f62893f382515..c025d73de3e7dff33f61105069f0eb417f7274af 100644 --- a/modules/commons/commons_activity_streams/commons_activity_page/commons_activity_page.info +++ b/modules/commons/commons_activity_streams/commons_activity_page/commons_activity_page.info @@ -3,12 +3,12 @@ description = Allows users to view a stream of site-wide and personalized activi core = 7.x package = Commons - Landing pages project = commons_activity_page +dependencies[] = commons_activity_streams +dependencies[] = commons_featured dependencies[] = ctools +dependencies[] = page_manager dependencies[] = panels dependencies[] = panels_ipe -dependencies[] = page_manager -dependencies[] = commons_featured -dependencies[] = commons_activity_streams features[ctools][] = page_manager:pages_default:1 -features[features_api][] = api:1 -features[page_manager_pages][] = commons_activity_streams_activity \ No newline at end of file +features[features_api][] = api:2 +features[page_manager_pages][] = commons_activity_streams_activity diff --git a/modules/commons/commons_activity_streams/commons_activity_streams.features.field_instance.inc b/modules/commons/commons_activity_streams/commons_activity_streams.features.field_instance.inc index ffde92e3940961639696637e1852e0dcb3d74937..2f4f612ffdd2d6b9e3925984c14c6e5158b4ce5c 100644 --- a/modules/commons/commons_activity_streams/commons_activity_streams.features.field_instance.inc +++ b/modules/commons/commons_activity_streams/commons_activity_streams.features.field_instance.inc @@ -14,14 +14,14 @@ function commons_activity_streams_field_default_field_instances() { $field_instances['message-commons_activity_streams_comment_created-field_target_comments'] = array( 'bundle' => 'commons_activity_streams_comment_created', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( 'label' => 'hidden', 'settings' => array(), 'type' => 'hidden', - 'weight' => '0', + 'weight' => 0, ), 'message_notify_email_body' => array( 'label' => 'above', @@ -49,10 +49,10 @@ function commons_activity_streams_field_default_field_instances() { 'settings' => array( 'match_operator' => 'CONTAINS', 'path' => '', - 'size' => '60', + 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => '1', + 'weight' => 1, ), ); @@ -60,14 +60,14 @@ function commons_activity_streams_field_default_field_instances() { $field_instances['message-commons_activity_streams_comment_created-field_target_nodes'] = array( 'bundle' => 'commons_activity_streams_comment_created', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( 'label' => 'hidden', 'settings' => array(), 'type' => 'hidden', - 'weight' => '1', + 'weight' => 1, ), 'message_notify_email_body' => array( 'label' => 'above', @@ -95,10 +95,10 @@ function commons_activity_streams_field_default_field_instances() { 'settings' => array( 'match_operator' => 'CONTAINS', 'path' => '', - 'size' => '60', + 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => '3', + 'weight' => 3, ), ); @@ -106,14 +106,14 @@ function commons_activity_streams_field_default_field_instances() { $field_instances['message-commons_activity_streams_node_created-field_target_nodes'] = array( 'bundle' => 'commons_activity_streams_node_created', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( 'label' => 'hidden', 'settings' => array(), 'type' => 'hidden', - 'weight' => '2', + 'weight' => 2, ), 'message_notify_email_body' => array( 'label' => 'above', @@ -141,10 +141,10 @@ function commons_activity_streams_field_default_field_instances() { 'settings' => array( 'match_operator' => 'CONTAINS', 'path' => '', - 'size' => '60', + 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => '3', + 'weight' => 3, ), ); @@ -153,7 +153,7 @@ function commons_activity_streams_field_default_field_instances() { 'bundle' => 'commons_activity_streams_user_profile_updated', 'default_value' => NULL, 'default_value_function' => '', - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -193,10 +193,10 @@ function commons_activity_streams_field_default_field_instances() { 'settings' => array( 'match_operator' => 'CONTAINS', 'path' => '', - 'size' => '60', + 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => '42', + 'weight' => 42, ), ); diff --git a/modules/commons/commons_activity_streams/commons_activity_streams.features.inc b/modules/commons/commons_activity_streams/commons_activity_streams.features.inc index b331da6ae86f907e58856a9abbd17ddef2612502..e0006bb2ef0ca53f3bb74381affac89677e79ef3 100644 --- a/modules/commons/commons_activity_streams/commons_activity_streams.features.inc +++ b/modules/commons/commons_activity_streams/commons_activity_streams.features.inc @@ -7,8 +7,7 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_activity_streams_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_activity_streams_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } @@ -17,7 +16,7 @@ function commons_activity_streams_ctools_plugin_api() { /** * Implements hook_views_api(). */ -function commons_activity_streams_views_api() { +function commons_activity_streams_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } diff --git a/modules/commons/commons_activity_streams/commons_activity_streams.info b/modules/commons/commons_activity_streams/commons_activity_streams.info index 3b217c71d55122b4675f1ab0ae2b90f14b44fb1b..25fecdc7e2e1c99f16993e271af7e947e4de3464 100644 --- a/modules/commons/commons_activity_streams/commons_activity_streams.info +++ b/modules/commons/commons_activity_streams/commons_activity_streams.info @@ -1,7 +1,6 @@ name = Commons Activity Streams core = 7.x package = Commons - Building blocks -php = 5.2.4 project = commons_activity_streams dependencies[] = commons_follow dependencies[] = ctools @@ -18,7 +17,7 @@ dependencies[] = views_load_more datestamp = 1361203022 features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_instance][] = message-commons_activity_streams_comment_created-field_target_comments features[field_instance][] = message-commons_activity_streams_comment_created-field_target_nodes features[field_instance][] = message-commons_activity_streams_node_created-field_target_nodes @@ -33,10 +32,10 @@ features[variable][] = timeago_comment features[variable][] = timeago_node features[views_view][] = commons_activity_streams_activity features[views_view][] = commons_activity_streams_user_activity -features_exclude[field_base][field_target_nodes] = field_target_nodes -features_exclude[field_base][field_target_comments] = field_target_comments -features_exclude[views_view][commons_bw_all] = commons_bw_all features_exclude[field][message-commons_activity_streams_comment_created-field_target_comments] = message-commons_activity_streams_comment_created-field_target_comments features_exclude[field][message-commons_activity_streams_comment_created-field_target_nodes] = message-commons_activity_streams_comment_created-field_target_nodes features_exclude[field][message-commons_activity_streams_node_created-field_target_nodes] = message-commons_activity_streams_node_created-field_target_nodes features_exclude[field][message-commons_activity_streams_user_profile_updated-field_target_users] = message-commons_activity_streams_user_profile_updated-field_target_users +features_exclude[field_base][field_target_nodes] = field_target_nodes +features_exclude[field_base][field_target_comments] = field_target_comments +features_exclude[views_view][commons_bw_all] = commons_bw_all diff --git a/modules/commons/commons_activity_streams/commons_activity_streams_groups/commons_activity_streams_groups.features.inc b/modules/commons/commons_activity_streams/commons_activity_streams_groups/commons_activity_streams_groups.features.inc index fc5eddbbd8f2e1ad428451635ebf60a2ad136b9c..e5a7598a728e6e1a17ab1008e278778ab83f76bd 100644 --- a/modules/commons/commons_activity_streams/commons_activity_streams_groups/commons_activity_streams_groups.features.inc +++ b/modules/commons/commons_activity_streams/commons_activity_streams_groups/commons_activity_streams_groups.features.inc @@ -7,6 +7,6 @@ /** * Implements hook_views_api(). */ -function commons_activity_streams_groups_views_api() { - return array("version" => "3.0"); +function commons_activity_streams_groups_views_api($module = NULL, $api = NULL) { + return array("api" => "3.0"); } diff --git a/modules/commons/commons_activity_streams/commons_activity_streams_groups/commons_activity_streams_groups.info b/modules/commons/commons_activity_streams/commons_activity_streams_groups/commons_activity_streams_groups.info index 3f230597629fbb493cb69a9a753c83ce4b017c9d..9a82caf5f778e4971170e2fac85635b6f5cb7005 100644 --- a/modules/commons/commons_activity_streams/commons_activity_streams_groups/commons_activity_streams_groups.info +++ b/modules/commons/commons_activity_streams/commons_activity_streams_groups/commons_activity_streams_groups.info @@ -2,12 +2,11 @@ name = Commons Activity Streams Groups description = Contains Organic Groups integration for Commons Activity Streams core = 7.x package = Commons - Building blocks -php = 5.2.4 project = commons_activity_streams_groups dependencies[] = commons_activity_streams dependencies[] = entity 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][] = activity_group diff --git a/modules/commons/commons_body/commons_body.features.field_base.inc b/modules/commons/commons_body/commons_body.features.field_base.inc index b6137784dc4aaf61df2ec4de2dd07dc52decb9b3..08b6813c39095bc97898db2deefd0163b044c4f7 100644 --- a/modules/commons/commons_body/commons_body.features.field_base.inc +++ b/modules/commons/commons_body/commons_body.features.field_base.inc @@ -12,9 +12,9 @@ function commons_body_field_default_field_bases() { // Exported field_base: 'body' $field_bases['body'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array( 0 => 'node', ), @@ -32,10 +32,10 @@ function commons_body_field_default_field_bases() { 0 => 'format', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'text', 'settings' => array(), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'text_with_summary', ); diff --git a/modules/commons/commons_body/commons_body.info b/modules/commons/commons_body/commons_body.info index 4e89fce8d9e86a7317c57ba9dfe075cf31af8bc8..d5b29099a4837fb2f6cc63dda6ffeaca4a6b8a87 100644 --- a/modules/commons/commons_body/commons_body.info +++ b/modules/commons/commons_body/commons_body.info @@ -6,5 +6,5 @@ project = commons_body dependencies[] = features dependencies[] = field_sql_storage dependencies[] = text -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_base][] = body diff --git a/modules/commons/commons_bw/commons_bw.features.field_base.inc b/modules/commons/commons_bw/commons_bw.features.field_base.inc index fcaa7e13aee43db34c6a04e9a20e93888ea551b6..34f1a3b417a4b8e652612a4c3ab3e7ab3faf6e5d 100644 --- a/modules/commons/commons_bw/commons_bw.features.field_base.inc +++ b/modules/commons/commons_bw/commons_bw.features.field_base.inc @@ -12,9 +12,9 @@ function commons_bw_field_default_field_bases() { // Exported field_base: 'title_field' $field_bases['title_field'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'title_field', 'foreign keys' => array( @@ -30,12 +30,12 @@ function commons_bw_field_default_field_bases() { 0 => 'format', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'text', 'settings' => array( 'max_length' => 255, ), - 'translatable' => '1', + 'translatable' => 1, 'type' => 'text', ); diff --git a/modules/commons/commons_bw/commons_bw.info b/modules/commons/commons_bw/commons_bw.info index 8ccf3cd1dcf7059b18341ace7e90c60dc9cec68d..a0d26df0eb1ada1483eaf8b311c5f31a6934cee5 100644 --- a/modules/commons/commons_bw/commons_bw.info +++ b/modules/commons/commons_bw/commons_bw.info @@ -1,11 +1,11 @@ -core = 7.x name = Commons Tabbed Browsing Widget -package = "Commons - Building blocks" +core = 7.x +package = Commons - Building blocks +dependencies[] = features dependencies[] = quicktabs dependencies[] = quicktabs_tabstyles dependencies[] = title - +features[features_api][] = api:2 features[field_base][] = title_field - -; Views handlers files[] = includes/views/handlers/commons_bw_handler_node_partial_form.inc +; Views handlers diff --git a/modules/commons/commons_content_moderation/commons_content_moderation.features.inc b/modules/commons/commons_content_moderation/commons_content_moderation.features.inc index 8be7ed8ec8cd7e797e2efec5c0c4208b889dd801..3a75218ce8859f45b1e7fc78d148be489eac155b 100644 --- a/modules/commons/commons_content_moderation/commons_content_moderation.features.inc +++ b/modules/commons/commons_content_moderation/commons_content_moderation.features.inc @@ -7,8 +7,7 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_content_moderation_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_content_moderation_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } @@ -17,7 +16,7 @@ function commons_content_moderation_ctools_plugin_api() { /** * Implements hook_views_api(). */ -function commons_content_moderation_views_api() { +function commons_content_moderation_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } @@ -30,7 +29,7 @@ function commons_content_moderation_flag_default_flags() { $flags['inappropriate_comment'] = array( 'content_type' => 'comment', 'title' => 'Comment inappropriate', - 'global' => '0', + 'global' => 0, 'types' => array( 0 => 'comment_node_answer', 1 => 'comment_node_event', @@ -50,10 +49,10 @@ function commons_content_moderation_flag_default_flags() { 'link_type' => 'confirm', 'roles' => array( 'flag' => array( - 0 => '2', + 0 => 2, ), 'unflag' => array( - 0 => '2', + 0 => 2, ), ), 'weight' => 0, @@ -72,7 +71,7 @@ function commons_content_moderation_flag_default_flags() { $flags['inappropriate_node'] = array( 'content_type' => 'node', 'title' => 'Node inappropriate', - 'global' => '0', + 'global' => 0, 'types' => array( 0 => 'event', 1 => 'group', @@ -90,10 +89,10 @@ function commons_content_moderation_flag_default_flags() { 'link_type' => 'confirm', 'roles' => array( 'flag' => array( - 0 => '2', + 0 => 2, ), 'unflag' => array( - 0 => '2', + 0 => 2, ), ), 'weight' => 0, diff --git a/modules/commons/commons_content_moderation/commons_content_moderation.features.user_role.inc b/modules/commons/commons_content_moderation/commons_content_moderation.features.user_role.inc index c631c5ff888f44671e075fe280b38a8885d92063..b1bff9e360f8080db4c81cb8ef56141c5627d3b8 100644 --- a/modules/commons/commons_content_moderation/commons_content_moderation.features.user_role.inc +++ b/modules/commons/commons_content_moderation/commons_content_moderation.features.user_role.inc @@ -13,7 +13,7 @@ function commons_content_moderation_user_default_roles() { // Exported role: content moderator. $roles['content moderator'] = array( 'name' => 'content moderator', - 'weight' => '2', + 'weight' => 2, ); return $roles; diff --git a/modules/commons/commons_content_moderation/commons_content_moderation.info b/modules/commons/commons_content_moderation/commons_content_moderation.info index b8a30a80cf01809d50fbaa61a9be915b702fbb40..703064fb8b68b4f5cf40edb45074964881cd306f 100644 --- a/modules/commons/commons_content_moderation/commons_content_moderation.info +++ b/modules/commons/commons_content_moderation/commons_content_moderation.info @@ -2,7 +2,6 @@ name = Commons Content moderation description = Commons Content moderation core = 7.x package = Commons - Building Blocks -php = 5.2.4 project = commons_content_moderation dependencies[] = ctools dependencies[] = flag @@ -12,7 +11,7 @@ dependencies[] = views datestamp = 1354747310 features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[flag][] = inappropriate_comment features[flag][] = inappropriate_node features[user_role][] = content moderator diff --git a/modules/commons/commons_documents/commons_documents.features.user_permission.inc b/modules/commons/commons_documents/commons_documents.features.user_permission.inc index d873548b8e49b307f186846c754c893786dd6926..f048d790183940773f701454455e75442cb229a9 100644 --- a/modules/commons/commons_documents/commons_documents.features.user_permission.inc +++ b/modules/commons/commons_documents/commons_documents.features.user_permission.inc @@ -10,7 +10,7 @@ function commons_documents_user_default_permissions() { $permissions = array(); - // Exported permission: create document content. + // Exported permission: 'create document content'. $permissions['create document content'] = array( 'name' => 'create document content', 'roles' => array( @@ -20,7 +20,7 @@ function commons_documents_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete any document content. + // Exported permission: 'delete any document content'. $permissions['delete any document content'] = array( 'name' => 'delete any document content', 'roles' => array( @@ -29,7 +29,7 @@ function commons_documents_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete own document content. + // Exported permission: 'delete own document content'. $permissions['delete own document content'] = array( 'name' => 'delete own document content', 'roles' => array( @@ -39,7 +39,7 @@ function commons_documents_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit any document content. + // Exported permission: 'edit any document content'. $permissions['edit any document content'] = array( 'name' => 'edit any document content', 'roles' => array( @@ -48,7 +48,7 @@ function commons_documents_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit own document content. + // Exported permission: 'edit own document content'. $permissions['edit own document content'] = array( 'name' => 'edit own document content', 'roles' => array( diff --git a/modules/commons/commons_events/commons_events.features.field_base.inc b/modules/commons/commons_events/commons_events.features.field_base.inc index 038c9c6d5bc5291bf2e378c73b4137d1aa977500..b8a0fa6c0c6306e9247fb278e6549fec8b5bd732 100644 --- a/modules/commons/commons_events/commons_events.features.field_base.inc +++ b/modules/commons/commons_events/commons_events.features.field_base.inc @@ -12,17 +12,17 @@ function commons_events_field_default_field_bases() { // Exported field_base: 'field_date' $field_bases['field_date'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_date', 'foreign keys' => array(), 'indexes' => array(), - 'locked' => '0', + 'locked' => 0, 'module' => 'date', 'settings' => array( - 'cache_count' => '4', + 'cache_count' => 4, 'cache_enabled' => 0, 'granularity' => array( 'day' => 'day', @@ -36,15 +36,15 @@ function commons_events_field_default_field_bases() { 'todate' => 'required', 'tz_handling' => 'site', ), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'datetime', ); // Exported field_base: 'field_location' $field_bases['field_location'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_location', 'foreign keys' => array(), @@ -53,7 +53,7 @@ function commons_events_field_default_field_bases() { 0 => 'value', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'list', 'settings' => array( 'allowed_values' => array( @@ -63,15 +63,15 @@ function commons_events_field_default_field_bases() { ), 'allowed_values_function' => '', ), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'list_text', ); // Exported field_base: 'field_logo' $field_bases['field_logo'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_logo', 'foreign keys' => array( @@ -87,37 +87,37 @@ function commons_events_field_default_field_bases() { 0 => 'fid', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'image', 'settings' => array( 'default_image' => 0, 'uri_scheme' => 'public', ), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'image', ); // Exported field_base: 'field_number_of_attendees' $field_bases['field_number_of_attendees'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_number_of_attendees', 'foreign keys' => array(), 'indexes' => array(), - 'locked' => '0', + 'locked' => 0, 'module' => 'number', 'settings' => array(), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'number_integer', ); // Exported field_base: 'field_offsite_url' $field_bases['field_offsite_url'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_offsite_url', 'foreign keys' => array( @@ -133,20 +133,20 @@ function commons_events_field_default_field_bases() { 0 => 'format', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'text', 'settings' => array( - 'max_length' => '255', + 'max_length' => 255, ), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'text', ); // Exported field_base: 'field_organizers' $field_bases['field_organizers'] = array( - 'active' => '1', - 'cardinality' => '-1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => -1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_organizers', 'foreign keys' => array( @@ -162,7 +162,7 @@ function commons_events_field_default_field_bases() { 0 => 'target_id', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'entityreference', 'settings' => array( 'handler' => 'base', @@ -179,15 +179,15 @@ function commons_events_field_default_field_bases() { ), 'target_type' => 'user', ), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'entityreference', ); // Exported field_base: 'field_registration' $field_bases['field_registration'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_registration', 'foreign keys' => array( @@ -203,18 +203,18 @@ function commons_events_field_default_field_bases() { 0 => 'registration_type', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'registration', 'settings' => array(), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'registration', ); // Exported field_base: 'field_registration_type' $field_bases['field_registration_type'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_registration_type', 'foreign keys' => array(), @@ -223,7 +223,7 @@ function commons_events_field_default_field_bases() { 0 => 'value', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'list', 'settings' => array( 'allowed_values' => array( @@ -232,7 +232,7 @@ function commons_events_field_default_field_bases() { ), 'allowed_values_function' => '', ), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'list_text', ); diff --git a/modules/commons/commons_events/commons_events.features.field_instance.inc b/modules/commons/commons_events/commons_events.features.field_instance.inc index c8fe9835139f1d4475fe68dcd886acba10d427f6..168e0a24399c5d8698886b828b9b36ef9a894905 100644 --- a/modules/commons/commons_events/commons_events.features.field_instance.inc +++ b/modules/commons/commons_events/commons_events.features.field_instance.inc @@ -20,7 +20,7 @@ function commons_events_field_default_field_instances() { $field_instances['node-event-body'] = array( 'bundle' => 'event', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -28,7 +28,7 @@ function commons_events_field_default_field_instances() { 'module' => 'text', 'settings' => array(), 'type' => 'text_default', - 'weight' => '5', + 'weight' => 5, ), 'teaser' => array( 'label' => 'hidden', @@ -37,7 +37,7 @@ function commons_events_field_default_field_instances() { 'trim_length' => 600, ), 'type' => 'text_summary_or_trimmed', - 'weight' => '3', + 'weight' => 3, ), ), 'entity_type' => 'node', @@ -46,18 +46,18 @@ function commons_events_field_default_field_instances() { 'required' => 1, 'settings' => array( 'display_summary' => FALSE, - 'text_processing' => '1', + 'text_processing' => 1, 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, 'module' => 'text', 'settings' => array( - 'rows' => '20', + 'rows' => 20, 'summary_rows' => 5, ), 'type' => 'text_textarea_with_summary', - 'weight' => '1', + 'weight' => 1, ), ); @@ -75,7 +75,7 @@ function commons_events_field_default_field_instances() { 'country' => !empty($default_country) ? $default_country : 'US', ), ), - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -91,7 +91,7 @@ function commons_events_field_default_field_instances() { 'separator' => ', ', ), 'type' => 'addressfield_components', - 'weight' => '2', + 'weight' => 2, ), 'teaser' => array( 'label' => 'hidden', @@ -106,7 +106,7 @@ function commons_events_field_default_field_instances() { 'separator' => ', ', ), 'type' => 'addressfield_components', - 'weight' => '2', + 'weight' => 2, ), ), 'entity_type' => 'node', @@ -130,14 +130,14 @@ function commons_events_field_default_field_instances() { ), ), 'type' => 'addressfield_standard', - 'weight' => '8', + 'weight' => 8, ), ); // Exported field_instance: 'node-event-field_date' $field_instances['node-event-field_date'] = array( 'bundle' => 'event', - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -151,7 +151,7 @@ function commons_events_field_default_field_instances() { 'multiple_to' => '', ), 'type' => 'date_default', - 'weight' => '1', + 'weight' => 1, ), 'teaser' => array( 'label' => 'hidden', @@ -159,9 +159,12 @@ function commons_events_field_default_field_instances() { 'settings' => array( 'format_type' => 'event_datetime', 'fromto' => 'both', + 'multiple_from' => '', + 'multiple_number' => '', + 'multiple_to' => '', ), 'type' => 'date_default', - 'weight' => '1', + 'weight' => 1, ), ), 'entity_type' => 'node', @@ -187,7 +190,7 @@ function commons_events_field_default_field_instances() { 'year_range' => '-3:+3', ), 'type' => 'date_popup', - 'weight' => '5', + 'weight' => 5, ), ); @@ -199,20 +202,20 @@ function commons_events_field_default_field_instances() { 'value' => 'online_physical', ), ), - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '9', + 'weight' => 9, ), 'teaser' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '0', + 'weight' => 0, ), ), 'entity_type' => 'node', @@ -227,14 +230,14 @@ function commons_events_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => '7', + 'weight' => 7, ), ); // Exported field_instance: 'node-event-field_logo' $field_instances['node-event-field_logo'] = array( 'bundle' => 'event', - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -245,16 +248,17 @@ function commons_events_field_default_field_instances() { 'image_style' => '50x50', ), 'type' => 'image', - 'weight' => '0', + 'weight' => 0, ), 'teaser' => array( 'label' => 'hidden', 'module' => 'image', 'settings' => array( + 'image_link' => '', 'image_style' => '50x50', ), 'type' => 'image', - 'weight' => '0', + 'weight' => 0, ), ), 'entity_type' => 'node', @@ -280,7 +284,7 @@ function commons_events_field_default_field_instances() { 'progress_indicator' => 'throbber', ), 'type' => 'image_image', - 'weight' => '9', + 'weight' => 9, ), ); @@ -289,17 +293,17 @@ function commons_events_field_default_field_instances() { 'bundle' => 'event', 'default_value' => array( 0 => array( - 'value' => '0', + 'value' => 0, ), ), - 'deleted' => '0', + 'deleted' => 0, 'description' => 'Enter 0 for unlimited', 'display' => array( 'default' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '8', + 'weight' => 8, ), 'teaser' => array( 'label' => 'above', @@ -314,7 +318,7 @@ function commons_events_field_default_field_instances() { 'required' => 1, 'settings' => array( 'max' => '', - 'min' => '0', + 'min' => 0, 'prefix' => '', 'suffix' => '', 'user_register_form' => FALSE, @@ -324,7 +328,7 @@ function commons_events_field_default_field_instances() { 'module' => 'number', 'settings' => array(), 'type' => 'number', - 'weight' => '12', + 'weight' => 12, ), ); @@ -332,7 +336,7 @@ function commons_events_field_default_field_instances() { $field_instances['node-event-field_offsite_url'] = array( 'bundle' => 'event', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -340,7 +344,7 @@ function commons_events_field_default_field_instances() { 'module' => 'text', 'settings' => array(), 'type' => 'text_default', - 'weight' => '4', + 'weight' => 4, ), 'teaser' => array( 'label' => 'above', @@ -354,17 +358,17 @@ function commons_events_field_default_field_instances() { 'label' => 'URL', 'required' => 0, 'settings' => array( - 'text_processing' => '0', + 'text_processing' => 0, 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, 'module' => 'text', 'settings' => array( - 'size' => '60', + 'size' => 60, ), 'type' => 'text_textfield', - 'weight' => '3', + 'weight' => 3, ), ); @@ -373,7 +377,7 @@ function commons_events_field_default_field_instances() { 'bundle' => 'event', 'default_value' => NULL, 'default_value_function' => '', - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -410,10 +414,10 @@ function commons_events_field_default_field_instances() { 'settings' => array( 'match_operator' => 'CONTAINS', 'path' => '', - 'size' => '60', + 'size' => 60, ), 'type' => 'entityreference_autocomplete_tags', - 'weight' => '2', + 'weight' => 2, ), ); @@ -425,14 +429,14 @@ function commons_events_field_default_field_instances() { 'registration_type' => 'event', ), ), - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '10', + 'weight' => 10, ), 'teaser' => array( 'label' => 'above', @@ -447,7 +451,7 @@ function commons_events_field_default_field_instances() { 'required' => 0, 'settings' => array( 'default_registration_settings' => array( - 'capacity' => '0', + 'capacity' => 0, 'reminder' => array( 'reminder_settings' => array( 'reminder_date' => '', @@ -472,7 +476,7 @@ function commons_events_field_default_field_instances() { 'module' => 'registration', 'settings' => array(), 'type' => 'registration_select', - 'weight' => '10', + 'weight' => 10, ), ); @@ -480,14 +484,14 @@ function commons_events_field_default_field_instances() { $field_instances['node-event-field_registration_type'] = array( 'bundle' => 'event', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '11', + 'weight' => 11, ), 'teaser' => array( 'label' => 'above', @@ -508,7 +512,7 @@ function commons_events_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => '11', + 'weight' => 11, ), ); @@ -522,7 +526,7 @@ function commons_events_field_default_field_instances() { t('Location'); t('Maximum number of attendees'); t('Organizers'); - t('Registration'); + t('Registration bundle'); t('Registration type'); t('URL'); diff --git a/modules/commons/commons_events/commons_events.features.inc b/modules/commons/commons_events/commons_events.features.inc index 669b093359825b50c8e9eb11eebf1757b8de7f2c..d8efeafe19a9658fffefff263483b9902673befa 100644 --- a/modules/commons/commons_events/commons_events.features.inc +++ b/modules/commons/commons_events/commons_events.features.inc @@ -7,17 +7,14 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_events_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_events_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "page_manager" && $api == "pages_default") { return array("version" => "1"); } - list($module, $api) = func_get_args(); - if ($module == "panelizer" && $api == "panelizer") { + if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } - list($module, $api) = func_get_args(); - if ($module == "strongarm" && $api == "strongarm") { + if ($module == "panelizer" && $api == "panelizer") { return array("version" => "1"); } } @@ -25,7 +22,7 @@ function commons_events_ctools_plugin_api() { /** * Implements hook_views_api(). */ -function commons_events_views_api() { +function commons_events_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } diff --git a/modules/commons/commons_events/commons_events.features.menu_links.inc b/modules/commons/commons_events/commons_events.features.menu_links.inc index 9548f078e6510591ce442c22bc96da64c277a4b8..2a4b6610c9ea4bdce52bae018a2ff73c663b7353 100644 --- a/modules/commons/commons_events/commons_events.features.menu_links.inc +++ b/modules/commons/commons_events/commons_events.features.menu_links.inc @@ -20,11 +20,12 @@ function commons_events_menu_default_menu_links() { 'attributes' => array(), ), 'module' => 'menu', - 'hidden' => '0', - 'external' => '0', - 'has_children' => '0', - 'expanded' => '0', - 'weight' => '2', + 'hidden' => 0, + 'external' => 0, + 'has_children' => 0, + 'expanded' => 0, + 'weight' => 2, + 'customized' => 0, ); // Translatables // Included for use with string extractors like potx. diff --git a/modules/commons/commons_events/commons_events.features.user_permission.inc b/modules/commons/commons_events/commons_events.features.user_permission.inc index d5a9b53cbbf747da425b56abbb2bca0673c19572..40d60d0c2a986087a41e3714886cd58685fbe6ac 100644 --- a/modules/commons/commons_events/commons_events.features.user_permission.inc +++ b/modules/commons/commons_events/commons_events.features.user_permission.inc @@ -10,7 +10,7 @@ function commons_events_user_default_permissions() { $permissions = array(); - // Exported permission: create event content. + // Exported permission: 'create event content'. $permissions['create event content'] = array( 'name' => 'create event content', 'roles' => array( @@ -20,7 +20,7 @@ function commons_events_user_default_permissions() { 'module' => 'node', ); - // Exported permission: create event registration. + // Exported permission: 'create event registration'. $permissions['create event registration'] = array( 'name' => 'create event registration', 'roles' => array( @@ -30,7 +30,7 @@ function commons_events_user_default_permissions() { 'module' => 'registration', ); - // Exported permission: delete own event content. + // Exported permission: 'delete own event content'. $permissions['delete own event content'] = array( 'name' => 'delete own event content', 'roles' => array( @@ -40,7 +40,7 @@ function commons_events_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete own event registration. + // Exported permission: 'delete own event registration'. $permissions['delete own event registration'] = array( 'name' => 'delete own event registration', 'roles' => array( @@ -50,7 +50,7 @@ function commons_events_user_default_permissions() { 'module' => 'registration', ); - // Exported permission: edit own event content. + // Exported permission: 'edit own event content'. $permissions['edit own event content'] = array( 'name' => 'edit own event content', 'roles' => array( @@ -60,7 +60,7 @@ function commons_events_user_default_permissions() { 'module' => 'node', ); - // Exported permission: update own event registration. + // Exported permission: 'update own event registration'. $permissions['update own event registration'] = array( 'name' => 'update own event registration', 'roles' => array( @@ -70,7 +70,7 @@ function commons_events_user_default_permissions() { 'module' => 'registration', ); - // Exported permission: view event registration. + // Exported permission: 'view event registration'. $permissions['view event registration'] = array( 'name' => 'view event registration', 'roles' => array( @@ -80,7 +80,7 @@ function commons_events_user_default_permissions() { 'module' => 'registration', ); - // Exported permission: view own event registration. + // Exported permission: 'view own event registration'. $permissions['view own event registration'] = array( 'name' => 'view own event registration', 'roles' => array( diff --git a/modules/commons/commons_events/commons_events.info b/modules/commons/commons_events/commons_events.info index 552ee49a28f8b8d8483f19467f4c43641f0db42e..485a8eadf222da67f056235be984acddb959f1be 100644 --- a/modules/commons/commons_events/commons_events.info +++ b/modules/commons/commons_events/commons_events.info @@ -2,7 +2,6 @@ name = Commons Events description = Provides the Event features for Drupal Commons. core = 7.x package = Commons - Content types -php = 5.2.4 project = commons_events dependencies[] = addressfield dependencies[] = addressfield_tokens @@ -44,7 +43,7 @@ datestamp = 1357735760 features[ctools][] = page_manager:pages_default:1 features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_base][] = field_date features[field_base][] = field_location features[field_base][] = field_logo diff --git a/modules/commons/commons_events/commons_events.views_default.inc b/modules/commons/commons_events/commons_events.views_default.inc index 869c3a10f8618e28159efd4b3a170f3f3ea6b6a2..8815a346d99cddef293a8bff17c76eed07cd28a0 100644 --- a/modules/commons/commons_events/commons_events.views_default.inc +++ b/modules/commons/commons_events/commons_events.views_default.inc @@ -39,7 +39,7 @@ function commons_events_views_default_views() { $handler->display->display_options['relationships']['registration_related_node']['id'] = 'registration_related_node'; $handler->display->display_options['relationships']['registration_related_node']['table'] = 'registration'; $handler->display->display_options['relationships']['registration_related_node']['field'] = 'registration_related_node'; - /* Relationship: Registration: User_uid */ + /* Relationship: Registration: User */ $handler->display->display_options['relationships']['user_uid']['id'] = 'user_uid'; $handler->display->display_options['relationships']['user_uid']['table'] = 'registration'; $handler->display->display_options['relationships']['user_uid']['field'] = 'user_uid'; @@ -250,7 +250,7 @@ function commons_events_views_default_views() { 'multiple_from' => '', 'multiple_to' => '', ); - /* Field: Registration Settings: Slots Used */ + /* Field: Registration Settings: Spaces used */ $handler->display->display_options['fields']['capacity_used']['id'] = 'capacity_used'; $handler->display->display_options['fields']['capacity_used']['table'] = 'node'; $handler->display->display_options['fields']['capacity_used']['field'] = 'capacity_used'; @@ -367,7 +367,7 @@ function commons_events_views_default_views() { 'multiple_from' => '', 'multiple_to' => '', ); - /* Field: Registration Settings: Slots Used */ + /* Field: Registration Settings: Spaces used */ $handler->display->display_options['fields']['capacity_used']['id'] = 'capacity_used'; $handler->display->display_options['fields']['capacity_used']['table'] = 'node'; $handler->display->display_options['fields']['capacity_used']['field'] = 'capacity_used'; @@ -508,7 +508,7 @@ function commons_events_views_default_views() { $handler->display->display_options['relationships']['registration_rel']['table'] = 'node'; $handler->display->display_options['relationships']['registration_rel']['field'] = 'registration_rel'; $handler->display->display_options['relationships']['registration_rel']['required'] = TRUE; - /* Relationship: Registration: User_uid */ + /* Relationship: Registration: User */ $handler->display->display_options['relationships']['user_uid']['id'] = 'user_uid'; $handler->display->display_options['relationships']['user_uid']['table'] = 'registration'; $handler->display->display_options['relationships']['user_uid']['field'] = 'user_uid'; @@ -526,7 +526,7 @@ function commons_events_views_default_views() { $handler->display->display_options['sorts']['created']['table'] = 'node'; $handler->display->display_options['sorts']['created']['field'] = 'created'; $handler->display->display_options['sorts']['created']['order'] = 'DESC'; - /* Contextual filter: Registration: User_uid */ + /* Contextual filter: Registration: User */ $handler->display->display_options['arguments']['user_uid']['id'] = 'user_uid'; $handler->display->display_options['arguments']['user_uid']['table'] = 'registration'; $handler->display->display_options['arguments']['user_uid']['field'] = 'user_uid'; @@ -592,7 +592,7 @@ function commons_events_views_default_views() { 'address' => 'address', ), ); - /* Field: Registration Settings: Slots Used */ + /* Field: Registration Settings: Spaces used */ $handler->display->display_options['fields']['capacity_used']['id'] = 'capacity_used'; $handler->display->display_options['fields']['capacity_used']['table'] = 'node'; $handler->display->display_options['fields']['capacity_used']['field'] = 'capacity_used'; @@ -611,7 +611,7 @@ function commons_events_views_default_views() { $handler->display->display_options['fields']['comment_count']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['comment_count']['separator'] = ''; $handler->display->display_options['defaults']['arguments'] = FALSE; - /* Contextual filter: Registration: User_uid */ + /* Contextual filter: Registration: User */ $handler->display->display_options['arguments']['user_uid']['id'] = 'user_uid'; $handler->display->display_options['arguments']['user_uid']['table'] = 'registration'; $handler->display->display_options['arguments']['user_uid']['field'] = 'user_uid'; @@ -660,7 +660,7 @@ function commons_events_views_default_views() { 'address' => 'address', ), ); - /* Field: Registration Settings: Slots Used */ + /* Field: Registration Settings: Spaces used */ $handler->display->display_options['fields']['capacity_used']['id'] = 'capacity_used'; $handler->display->display_options['fields']['capacity_used']['table'] = 'node'; $handler->display->display_options['fields']['capacity_used']['field'] = 'capacity_used'; @@ -732,7 +732,7 @@ function commons_events_views_default_views() { 'address' => 'address', ), ); - /* Field: Registration Settings: Slots Used */ + /* Field: Registration Settings: Spaces used */ $handler->display->display_options['fields']['capacity_used']['id'] = 'capacity_used'; $handler->display->display_options['fields']['capacity_used']['table'] = 'node'; $handler->display->display_options['fields']['capacity_used']['field'] = 'capacity_used'; diff --git a/modules/commons/commons_events/modules/commons_events_pages/commons_events_pages.features.inc b/modules/commons/commons_events/modules/commons_events_pages/commons_events_pages.features.inc index 5d02c47db495680bf1693d0cb7e7ae53e2e30804..ccd853ef440ac43a5634872476d17720308b2b8c 100644 --- a/modules/commons/commons_events/modules/commons_events_pages/commons_events_pages.features.inc +++ b/modules/commons/commons_events/modules/commons_events_pages/commons_events_pages.features.inc @@ -7,12 +7,10 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_events_pages_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_events_pages_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "panelizer" && $api == "panelizer") { return array("version" => "1"); } - list($module, $api) = func_get_args(); if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } diff --git a/modules/commons/commons_events/modules/commons_events_pages/commons_events_pages.info b/modules/commons/commons_events/modules/commons_events_pages/commons_events_pages.info index bb7d1fc92202ea7004a01d4a25c1fccfbd8b3fbe..4ecdb47714087b3d07340f1d83bd48177f92eccc 100644 --- a/modules/commons/commons_events/modules/commons_events_pages/commons_events_pages.info +++ b/modules/commons/commons_events/modules/commons_events_pages/commons_events_pages.info @@ -2,14 +2,14 @@ name = Commons Events Pages description = Provides the panelized Event page feature. core = 7.x package = Commons - Landing pages -php = 5.2.4 project = commons_events_pages dependencies[] = commons_events dependencies[] = panelizer +dependencies[] = strongarm datestamp = 1357735760 features[ctools][] = panelizer:panelizer:1 features[ctools][] = strongarm:strongarm:1 -features[features_api][] = api:1 +features[features_api][] = api:2 features[panelizer_defaults][] = node:event:default features[variable][] = panelizer_defaults_node_event files[] = commons_events_pages.features.inc diff --git a/modules/commons/commons_featured/commons_featured.features.inc b/modules/commons/commons_featured/commons_featured.features.inc index 970b48ce9efecc9aa0c5aa6e093a1412983bc81b..5c9f7a802c9152cb2db5d7276a09e42366401bfc 100644 --- a/modules/commons/commons_featured/commons_featured.features.inc +++ b/modules/commons/commons_featured/commons_featured.features.inc @@ -7,6 +7,6 @@ /** * Implements hook_views_api(). */ -function commons_featured_views_api() { +function commons_featured_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } diff --git a/modules/commons/commons_featured/commons_featured.info b/modules/commons/commons_featured/commons_featured.info index 14a73613e12929fe459429e48f72cc4781b8eeb3..cbd43ccf2967b6bc36f2c1c71b3b55ffc0180823 100644 --- a/modules/commons/commons_featured/commons_featured.info +++ b/modules/commons/commons_featured/commons_featured.info @@ -2,11 +2,10 @@ name = Commons Featured Content description = Allows community managers to display certain pieces of content more prominently on the site. core = 7.x package = Commons - Building blocks -php = 5.2.4 project = commons_featured dependencies[] = views dependencies[] = views_content datestamp = 1354747305 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[views_view][] = commons_featured diff --git a/modules/commons/commons_featured/commons_featured.views_default.inc b/modules/commons/commons_featured/commons_featured.views_default.inc index 9ab12592dd2ddc85ef0ad972a004c24e6ffc99cb..cabd63358487316616ac8a6638c260a6c1ba9e2e 100644 --- a/modules/commons/commons_featured/commons_featured.views_default.inc +++ b/modules/commons/commons_featured/commons_featured.views_default.inc @@ -81,7 +81,7 @@ function commons_featured_views_default_views() { 'address' => 'address', ), ); - /* Field: Registration Settings: Slots Used */ + /* Field: Registration Settings: Spaces used */ $handler->display->display_options['fields']['capacity_used']['id'] = 'capacity_used'; $handler->display->display_options['fields']['capacity_used']['table'] = 'node'; $handler->display->display_options['fields']['capacity_used']['field'] = 'capacity_used'; diff --git a/modules/commons/commons_follow/commons_follow.features.field_base.inc b/modules/commons/commons_follow/commons_follow.features.field_base.inc index 422bc50bebbe89932cb14f8258802b6e5fe2346b..3e58098a510ee75d47170b4eb00fcc7b80b65610 100644 --- a/modules/commons/commons_follow/commons_follow.features.field_base.inc +++ b/modules/commons/commons_follow/commons_follow.features.field_base.inc @@ -12,13 +12,13 @@ function commons_follow_field_default_field_bases() { // Exported field_base: 'field_target_comments' $field_bases['field_target_comments'] = array( - 'active' => '1', - 'cardinality' => '-1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => -1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_target_comments', 'field_permissions' => array( - 'type' => '0', + 'type' => 0, ), 'foreign keys' => array( 'comment' => array( @@ -33,7 +33,7 @@ function commons_follow_field_default_field_bases() { 0 => 'target_id', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'entityreference', 'settings' => array( 'handler' => 'base', @@ -51,19 +51,19 @@ function commons_follow_field_default_field_bases() { 'handler_submit' => 'Change handler', 'target_type' => 'comment', ), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'entityreference', ); // Exported field_base: 'field_target_nodes' $field_bases['field_target_nodes'] = array( - 'active' => '1', - 'cardinality' => '-1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => -1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_target_nodes', 'field_permissions' => array( - 'type' => '0', + 'type' => 0, ), 'foreign keys' => array( 'node' => array( @@ -78,7 +78,7 @@ function commons_follow_field_default_field_bases() { 0 => 'target_id', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'entityreference', 'settings' => array( 'handler' => 'base', @@ -96,19 +96,19 @@ function commons_follow_field_default_field_bases() { 'handler_submit' => 'Change handler', 'target_type' => 'node', ), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'entityreference', ); // Exported field_base: 'field_target_users' $field_bases['field_target_users'] = array( - 'active' => '1', - 'cardinality' => '-1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => -1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_target_users', 'field_permissions' => array( - 'type' => '0', + 'type' => 0, ), 'foreign keys' => array( 'users' => array( @@ -123,7 +123,7 @@ function commons_follow_field_default_field_bases() { 0 => 'target_id', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'entityreference', 'settings' => array( 'handler' => 'base', @@ -144,7 +144,7 @@ function commons_follow_field_default_field_bases() { 'handler_submit' => 'Change handler', 'target_type' => 'user', ), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'entityreference', ); diff --git a/modules/commons/commons_follow/commons_follow.features.inc b/modules/commons/commons_follow/commons_follow.features.inc index 05b4e52ca394ae5ed54405635e7355deb5faf94b..75926cd5d300a5268331aff1e5f01ea89f1f99f0 100644 --- a/modules/commons/commons_follow/commons_follow.features.inc +++ b/modules/commons/commons_follow/commons_follow.features.inc @@ -7,8 +7,7 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_follow_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_follow_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } @@ -35,10 +34,10 @@ function commons_follow_image_default_styles() { 'module' => 'image', 'name' => 'image_scale_and_crop', 'data' => array( - 'width' => '50', - 'height' => '50', + 'width' => 50, + 'height' => 50, ), - 'weight' => '1', + 'weight' => 1, ), ), ); diff --git a/modules/commons/commons_follow/commons_follow.info b/modules/commons/commons_follow/commons_follow.info index 8015b975e537bb23fb3cde90dfb6e98bb3d1e538..884315a0d8e5b1c40e823fc3419ab59041261f16 100644 --- a/modules/commons/commons_follow/commons_follow.info +++ b/modules/commons/commons_follow/commons_follow.info @@ -2,7 +2,6 @@ name = Commons Follow description = Views and Field integration for Commons Following functionality. core = 7.x package = Commons - Building blocks -php = 5.2.4 project = commons_follow dependencies[] = ctools dependencies[] = entityreference @@ -12,7 +11,7 @@ dependencies[] = message_subscribe dependencies[] = strongarm datestamp = 1354747305 features[ctools][] = strongarm:strongarm:1 -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_base][] = field_target_comments features[field_base][] = field_target_nodes features[field_base][] = field_target_users diff --git a/modules/commons/commons_follow/commons_follow_group/commons_follow_group.features.inc b/modules/commons/commons_follow/commons_follow_group/commons_follow_group.features.inc index e6449661d4ed9ad50222cba534b95d9e9e665cb5..badb5fdf467ff357c71820d13ddb85c33c2f2639 100644 --- a/modules/commons/commons_follow/commons_follow_group/commons_follow_group.features.inc +++ b/modules/commons/commons_follow/commons_follow_group/commons_follow_group.features.inc @@ -7,8 +7,7 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_follow_group_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_follow_group_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } @@ -23,7 +22,7 @@ function commons_follow_group_flag_default_flags() { $flags['commons_follow_group'] = array( 'content_type' => 'node', 'title' => 'Groups', - 'global' => '0', + 'global' => 0, 'types' => array( 0 => 'group', ), @@ -37,10 +36,10 @@ function commons_follow_group_flag_default_flags() { 'link_type' => 'toggle', 'roles' => array( 'flag' => array( - 0 => '2', + 0 => 2, ), 'unflag' => array( - 0 => '2', + 0 => 2, ), ), 'weight' => 0, @@ -60,7 +59,7 @@ function commons_follow_group_flag_default_flags() { $flags['email_group'] = array( 'content_type' => 'node', 'title' => 'Commons Follow (Groups - Email)', - 'global' => '0', + 'global' => 0, 'types' => array( 0 => 'group', ), @@ -74,13 +73,13 @@ function commons_follow_group_flag_default_flags() { 'link_type' => 'toggle', 'roles' => array( 'flag' => array( - 0 => '2', + 0 => 2, ), 'unflag' => array( - 0 => '2', + 0 => 2, ), ), - 'weight' => '-11', + 'weight' => -11, 'show_on_form' => 0, 'access_author' => '', 'show_on_page' => 0, @@ -88,10 +87,10 @@ function commons_follow_group_flag_default_flags() { 'show_contextual_link' => FALSE, 'i18n' => 0, 'module' => 'commons_follow_group', - 'api_version' => 2, 'locked' => array( 0 => 'name', ), + 'api_version' => 2, ); return $flags; diff --git a/modules/commons/commons_follow/commons_follow_group/commons_follow_group.info b/modules/commons/commons_follow/commons_follow_group/commons_follow_group.info index 5d3b8ec8fff7742bda6f523f6696a3741c9749a9..68503a281c8ade67131cd744c981177c7f867b75 100644 --- a/modules/commons/commons_follow/commons_follow_group/commons_follow_group.info +++ b/modules/commons/commons_follow/commons_follow_group/commons_follow_group.info @@ -2,7 +2,6 @@ name = Commons Follow (Groups) description = Lets users follow individual organic groups. core = 7.x package = Commons - Building blocks -php = 5.2.4 project = commons_follow dependencies[] = ctools dependencies[] = flag @@ -10,7 +9,7 @@ dependencies[] = og dependencies[] = strongarm datestamp = 1352387638 features[ctools][] = strongarm:strongarm:1 -features[features_api][] = api:1 +features[features_api][] = api:2 features[flag][] = commons_follow_group features[flag][] = email_group features[variable][] = message_subscribe_og diff --git a/modules/commons/commons_follow/commons_follow_node/commons_follow_node.features.inc b/modules/commons/commons_follow/commons_follow_node/commons_follow_node.features.inc index 3c30859bf6ef450dbd446a820ed1ecdf979d5ba6..1f8e2945b56dc38fab624d9bd66016ce26a5585f 100644 --- a/modules/commons/commons_follow/commons_follow_node/commons_follow_node.features.inc +++ b/modules/commons/commons_follow/commons_follow_node/commons_follow_node.features.inc @@ -7,7 +7,7 @@ /** * Implements hook_views_api(). */ -function commons_follow_node_views_api() { +function commons_follow_node_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } @@ -20,9 +20,8 @@ function commons_follow_node_flag_default_flags() { $flags['commons_follow_node'] = array( 'content_type' => 'node', 'title' => 'Other content', - 'global' => '0', - 'types' => array( - ), + 'global' => 0, + 'types' => array(), 'flag_short' => 'Follow', 'flag_long' => '', 'flag_message' => '', @@ -33,13 +32,13 @@ function commons_follow_node_flag_default_flags() { 'link_type' => 'toggle', 'roles' => array( 'flag' => array( - 0 => '2', + 0 => 2, ), 'unflag' => array( - 0 => '2', + 0 => 2, ), ), - 'weight' => '-10', + 'weight' => -10, 'show_on_form' => 0, 'access_author' => '', 'show_on_page' => 1, @@ -56,9 +55,8 @@ function commons_follow_node_flag_default_flags() { $flags['email_node'] = array( 'content_type' => 'node', 'title' => 'Email content', - 'global' => '0', - 'types' => array( - ), + 'global' => 0, + 'types' => array(), 'flag_short' => 'Send Email', 'flag_long' => '', 'flag_message' => '', @@ -69,10 +67,10 @@ function commons_follow_node_flag_default_flags() { 'link_type' => 'toggle', 'roles' => array( 'flag' => array( - 0 => '2', + 0 => 2, ), 'unflag' => array( - 0 => '2', + 0 => 2, ), ), 'weight' => 0, @@ -83,10 +81,10 @@ function commons_follow_node_flag_default_flags() { 'show_contextual_link' => 0, 'i18n' => 0, 'module' => 'commons_follow_node', - 'api_version' => 2, 'locked' => array( 0 => 'name', ), + 'api_version' => 2, ); return $flags; diff --git a/modules/commons/commons_follow/commons_follow_node/commons_follow_node.info b/modules/commons/commons_follow/commons_follow_node/commons_follow_node.info index 0aae69a274c7c2e71f73d529ec20aeb5028d51c9..a22ad5ff519b3e2dd0affce49f5067e4506d3677 100644 --- a/modules/commons/commons_follow/commons_follow_node/commons_follow_node.info +++ b/modules/commons/commons_follow/commons_follow_node/commons_follow_node.info @@ -2,14 +2,13 @@ name = Commons Follow (Individual nodes) description = Lets users follow individual nodes. core = 7.x package = Commons - Building blocks -php = 5.2.4 project = commons_follow dependencies[] = ctools dependencies[] = flag dependencies[] = views_litepager datestamp = 1356630025 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[flag][] = commons_follow_node features[flag][] = email_node features[views_view][] = commons_follow_node diff --git a/modules/commons/commons_follow/commons_follow_term/commons_follow_term.features.inc b/modules/commons/commons_follow/commons_follow_term/commons_follow_term.features.inc index e73e2bcd4290bc30460ff55cc2a6cd3201024686..4b10c15203fbdfbbd7aa71060be75a60242896fe 100644 --- a/modules/commons/commons_follow/commons_follow_term/commons_follow_term.features.inc +++ b/modules/commons/commons_follow/commons_follow_term/commons_follow_term.features.inc @@ -7,7 +7,7 @@ /** * Implements hook_views_api(). */ -function commons_follow_term_views_api() { +function commons_follow_term_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } @@ -20,7 +20,7 @@ function commons_follow_term_flag_default_flags() { $flags['commons_follow_term'] = array( 'content_type' => 'taxonomy_term', 'title' => 'Topics', - 'global' => '0', + 'global' => 0, 'types' => array( 0 => 'topics', ), @@ -34,13 +34,13 @@ function commons_follow_term_flag_default_flags() { 'link_type' => 'toggle', 'roles' => array( 'flag' => array( - 0 => '2', + 0 => 2, ), 'unflag' => array( - 0 => '2', + 0 => 2, ), ), - 'weight' => '-8', + 'weight' => -8, 'show_on_entity' => 1, 'show_on_form' => 0, 'access_author' => '', @@ -54,7 +54,7 @@ function commons_follow_term_flag_default_flags() { $flags['email_term'] = array( 'content_type' => 'taxonomy_term', 'title' => 'Email term', - 'global' => '0', + 'global' => 0, 'types' => array( 0 => 'topics', ), @@ -68,10 +68,10 @@ function commons_follow_term_flag_default_flags() { 'link_type' => 'toggle', 'roles' => array( 'flag' => array( - 0 => '2', + 0 => 2, ), 'unflag' => array( - 0 => '2', + 0 => 2, ), ), 'weight' => 0, @@ -79,10 +79,10 @@ function commons_follow_term_flag_default_flags() { 'show_on_form' => 0, 'access_author' => '', 'module' => 'commons_follow_term', - 'api_version' => 2, 'locked' => array( 0 => 'name', ), + 'api_version' => 2, ); return $flags; diff --git a/modules/commons/commons_follow/commons_follow_term/commons_follow_term.info b/modules/commons/commons_follow/commons_follow_term/commons_follow_term.info index 1f139a4c39930b6d2c248f336960713b29f9bf67..795de817b34ac9f25393728a4bec67a34158000d 100644 --- a/modules/commons/commons_follow/commons_follow_term/commons_follow_term.info +++ b/modules/commons/commons_follow/commons_follow_term/commons_follow_term.info @@ -2,7 +2,6 @@ name = Commons Follow (Taxonomy terms) description = Lets users follow individual taxonomy terms core = 7.x package = Commons - Building blocks -php = 5.2.4 project = commons_follow dependencies[] = flag dependencies[] = views diff --git a/modules/commons/commons_follow/commons_follow_user/commons_follow_user.features.field_instance.inc b/modules/commons/commons_follow/commons_follow_user/commons_follow_user.features.field_instance.inc index a9172e924ae41099ca811af6e22739557ec47f6c..2861d267b7a8f3ec7446d3a42e557766f6317de3 100644 --- a/modules/commons/commons_follow/commons_follow_user/commons_follow_user.features.field_instance.inc +++ b/modules/commons/commons_follow/commons_follow_user/commons_follow_user.features.field_instance.inc @@ -14,14 +14,14 @@ function commons_follow_user_field_default_field_instances() { $field_instances['message-commons_follow_user_user_followed-field_target_users'] = array( 'bundle' => 'commons_follow_user_user_followed', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( 'label' => 'hidden', 'settings' => array(), 'type' => 'hidden', - 'weight' => '0', + 'weight' => 0, ), 'message_notify_email_body' => array( 'label' => 'above', @@ -49,10 +49,10 @@ function commons_follow_user_field_default_field_instances() { 'settings' => array( 'match_operator' => 'CONTAINS', 'path' => '', - 'size' => '60', + 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => '1', + 'weight' => 1, ), ); diff --git a/modules/commons/commons_follow/commons_follow_user/commons_follow_user.features.inc b/modules/commons/commons_follow/commons_follow_user/commons_follow_user.features.inc index a36bed7ae4e887395ae5736e6c7f023bf4b154cd..c3cf9ca207658e4c41a0528e24edb7935f6a4a09 100644 --- a/modules/commons/commons_follow/commons_follow_user/commons_follow_user.features.inc +++ b/modules/commons/commons_follow/commons_follow_user/commons_follow_user.features.inc @@ -5,9 +5,18 @@ */ /** + * Implements hook_ctools_plugin_api(). + */ +function commons_follow_user_ctools_plugin_api($module = NULL, $api = NULL) { + if ($module == "strongarm" && $api == "strongarm") { + return array("version" => "1"); + } +} + +/** * Implements hook_views_api(). */ -function commons_follow_user_views_api() { +function commons_follow_user_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } @@ -20,7 +29,7 @@ function commons_follow_user_flag_default_flags() { $flags['commons_follow_user'] = array( 'content_type' => 'user', 'title' => 'People', - 'global' => '0', + 'global' => 0, 'types' => array(), 'flag_short' => 'Follow', 'flag_long' => '', @@ -32,13 +41,14 @@ function commons_follow_user_flag_default_flags() { 'link_type' => 'toggle', 'roles' => array( 'flag' => array( - 0 => '2', + 0 => 2, ), 'unflag' => array( - 0 => '2', + 0 => 2, ), ), - 'weight' => '-13', + 'weight' => -13, + 'show_on_entity' => FALSE, 'show_on_form' => 0, 'access_author' => '', 'show_on_profile' => 1, @@ -53,7 +63,7 @@ function commons_follow_user_flag_default_flags() { $flags['email_user'] = array( 'content_type' => 'user', 'title' => 'Email user', - 'global' => '0', + 'global' => 0, 'types' => array(), 'flag_short' => 'Send Email', 'flag_long' => '', @@ -65,10 +75,10 @@ function commons_follow_user_flag_default_flags() { 'link_type' => 'toggle', 'roles' => array( 'flag' => array( - 0 => '2', + 0 => 2, ), 'unflag' => array( - 0 => '2', + 0 => 2, ), ), 'weight' => 0, diff --git a/modules/commons/commons_follow/commons_follow_user/commons_follow_user.info b/modules/commons/commons_follow/commons_follow_user/commons_follow_user.info index 8e807907be10117590c8a994ae7413615f02557c..27dd695121b24ef743f718b35481985397b29ae9 100644 --- a/modules/commons/commons_follow/commons_follow_user/commons_follow_user.info +++ b/modules/commons/commons_follow/commons_follow_user/commons_follow_user.info @@ -2,7 +2,6 @@ name = Commons Follow (Users) description = Lets users follow other users. core = 7.x package = Commons - Building blocks -php = 5.2.4 project = commons_follow dependencies[] = commons_follow dependencies[] = entityreference @@ -14,7 +13,7 @@ dependencies[] = views_litepager dependencies[] = views_load_more datestamp = 1356630025 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_instance][] = message-commons_follow_user_user_followed-field_target_users features[flag][] = commons_follow_user features[flag][] = email_user diff --git a/modules/commons/commons_groups/commons_groups.info b/modules/commons/commons_groups/commons_groups.info index 42f3dd4d7b24e8fb6762868b741a3619b317f44a..a4260b17021ee94d1383bf90f453cc1c283204d1 100644 --- a/modules/commons/commons_groups/commons_groups.info +++ b/modules/commons/commons_groups/commons_groups.info @@ -27,22 +27,27 @@ dependencies[] = taxonomy dependencies[] = text dependencies[] = views dependencies[] = views_content +dependencies[] = views_litepager dependencies[] = views_load_more features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 features[features_api][] = api:2 +features[field_base][] = field_group_logo +features[field_base][] = field_og_access_default_value +features[field_base][] = field_og_subscribe_settings features[field_base][] = group_access features[field_base][] = group_content_access features[field_base][] = group_group -features[field_base][] = og_roles_permissions features[field_base][] = og_group_ref -features[field_base][] = field_og_subscribe_settings -features[field_base][] = field_og_access_default_value features[field_base][] = og_membership_request -features[field_base][] = field_group_logo -features[field_instance][] = node-group-field_group_logo +features[field_base][] = og_roles_permissions features[field_instance][] = node-group-body +features[field_instance][] = node-group-field_group_logo +features[field_instance][] = node-group-field_og_access_default_value +features[field_instance][] = node-group-field_og_subscribe_settings +features[field_instance][] = node-group-group_access features[field_instance][] = node-group-group_group +features[field_instance][] = node-group-og_roles_permissions features[field_instance][] = og_membership-og_membership_type_default-og_membership_request features[image][] = 35x35 features[image][] = 50x50 @@ -73,4 +78,4 @@ features[views_view][] = commons_groups_directory features[views_view][] = commons_groups_recent_content features[views_view][] = commons_groups_user_groups features_exclude[field][node-group-group_group] = node-group-group_group -features_exclude[field][node-group-group_access] = node-group-group_access \ No newline at end of file +features_exclude[field][node-group-group_access] = node-group-group_access diff --git a/modules/commons/commons_groups/commons_groups.views_default.inc b/modules/commons/commons_groups/commons_groups.views_default.inc index 0e2b245e58c6cd5cf99e26672be7336a92e04c9d..81a19681495752fd23898489d58592b78d7b89bb 100644 --- a/modules/commons/commons_groups/commons_groups.views_default.inc +++ b/modules/commons/commons_groups/commons_groups.views_default.inc @@ -32,7 +32,7 @@ function commons_groups_views_default_views() { $handler->display->display_options['pager']['type'] = 'lite'; $handler->display->display_options['pager']['options']['items_per_page'] = '10'; $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['pager']['options']['id'] = '0'; + $handler->display->display_options['pager']['options']['id'] = 1; $handler->display->display_options['pager']['options']['quantity'] = '9'; $handler->display->display_options['style_plugin'] = 'default'; $handler->display->display_options['row_plugin'] = 'node'; @@ -1062,7 +1062,6 @@ function commons_groups_views_default_views() { /* Display: Master */ $handler = $view->new_display('default', 'Master', 'default'); $handler->display->display_options['title'] = 'Groups'; - $handler->display->display_options['use_ajax'] = FALSE; $handler->display->display_options['use_more_always'] = FALSE; $handler->display->display_options['access']['type'] = 'perm'; $handler->display->display_options['cache']['type'] = 'none'; diff --git a/modules/commons/commons_groups/modules/commons_groups_directory/commons_groups_directory.features.inc b/modules/commons/commons_groups/modules/commons_groups_directory/commons_groups_directory.features.inc index 53888517d108061c72ccf82d6591fc7268931e89..ad3cadbe06f432ed82bed7c29a5814763a432365 100644 --- a/modules/commons/commons_groups/modules/commons_groups_directory/commons_groups_directory.features.inc +++ b/modules/commons/commons_groups/modules/commons_groups_directory/commons_groups_directory.features.inc @@ -7,12 +7,10 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_groups_directory_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_groups_directory_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "page_manager" && $api == "pages_default") { return array("version" => "1"); } - list($module, $api) = func_get_args(); if ($module == "panelizer" && $api == "panelizer") { return array("version" => "1"); } @@ -21,6 +19,6 @@ function commons_groups_directory_ctools_plugin_api() { /** * Implements hook_views_api(). */ -function commons_groups_directory_views_api() { +function commons_groups_directory_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } diff --git a/modules/commons/commons_groups/modules/commons_groups_directory/commons_groups_directory.info b/modules/commons/commons_groups/modules/commons_groups_directory/commons_groups_directory.info index c587a6188532d95eff39ef72b7b0fc994a769716..785a49130d9152525bf2382b2336fcc61528bb17 100644 --- a/modules/commons/commons_groups/modules/commons_groups_directory/commons_groups_directory.info +++ b/modules/commons/commons_groups/modules/commons_groups_directory/commons_groups_directory.info @@ -2,7 +2,6 @@ name = Commons Groups Directory description = The site-wide directory of groups core = 7.x package = Commons - Landing pages -php = 5.2.4 project = commons_groups dependencies[] = commons_activity_streams_groups dependencies[] = commons_radioactivity_groups @@ -15,5 +14,5 @@ datestamp = 1354346062 features[ctools][] = page_manager:pages_default:1 features[ctools][] = panelizer:panelizer:1 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[page_manager_pages][] = groups_directory diff --git a/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.features.inc b/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.features.inc index 32fbd7f6a8368d7011044ad86cb556af9cc83315..4d103b26c39ce8e220d7d08fafa008626314a251 100644 --- a/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.features.inc +++ b/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.features.inc @@ -7,12 +7,10 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_groups_pages_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_groups_pages_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "panelizer" && $api == "panelizer") { return array("version" => "1"); } - list($module, $api) = func_get_args(); if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } diff --git a/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.info b/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.info index 2b341fd1980919d778b3fea615f1f574ce372894..07d2dd01fc3228581d1c094fca5f242d229f4829 100644 --- a/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.info +++ b/modules/commons/commons_groups/modules/commons_groups_pages/commons_groups_pages.info @@ -2,7 +2,6 @@ name = Commons Group Homepages description = Provides a default home page for groups core = 7.x package = Commons - Landing pages -php = 5.2.4 project = commons_groups dependencies[] = commons_activity_streams dependencies[] = commons_bw @@ -14,7 +13,7 @@ dependencies[] = strongarm datestamp = 1354346062 features[ctools][] = panelizer:panelizer:1 features[ctools][] = strongarm:strongarm:1 -features[features_api][] = api:1 +features[features_api][] = api:2 features[panelizer_defaults][] = node:group:default features[panelizer_defaults][] = node:group:default:teaser features[variable][] = panelizer_defaults_node_group diff --git a/modules/commons/commons_like/commons_like.features.field_instance.inc b/modules/commons/commons_like/commons_like.features.field_instance.inc index a129464c89c99e2d1019563d907892827b2fd19e..1ff8c39e15269b3524f091d523597f673b9ff000 100644 --- a/modules/commons/commons_like/commons_like.features.field_instance.inc +++ b/modules/commons/commons_like/commons_like.features.field_instance.inc @@ -14,11 +14,12 @@ function commons_like_field_default_field_instances() { $field_instances['message-commons_like_user_likes_node-field_target_nodes'] = array( 'bundle' => 'commons_like_user_likes_node', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( 'label' => 'hidden', + 'settings' => array(), 'type' => 'hidden', 'weight' => 0, ), @@ -50,7 +51,7 @@ function commons_like_field_default_field_instances() { 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => '2', + 'weight' => 2, ), ); diff --git a/modules/commons/commons_like/commons_like.features.inc b/modules/commons/commons_like/commons_like.features.inc index 90f00f2ec27cf2ac00c6034546f35603cc40aad4..d5ecfdb57cd5ec321c77c2ab6df8d74549299502 100644 --- a/modules/commons/commons_like/commons_like.features.inc +++ b/modules/commons/commons_like/commons_like.features.inc @@ -7,8 +7,7 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_like_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_like_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } diff --git a/modules/commons/commons_like/commons_like.info b/modules/commons/commons_like/commons_like.info index 2acf8e4092fa700fc3fca1fd1b3898207a62ccc4..09c8b59ca2b55b2b64e853a560b0b0f6cd5f4f23 100644 --- a/modules/commons/commons_like/commons_like.info +++ b/modules/commons/commons_like/commons_like.info @@ -1,15 +1,15 @@ name = Commons Like description = Community members can indicate that they like content and comments. core = 7.x -package = "Commons - Building blocks" -php = 5.2.4 +package = Commons - Building blocks project = commons_like +dependencies[] = entityreference dependencies[] = features +dependencies[] = message dependencies[] = rate dependencies[] = strongarm dependencies[] = votingapi features[ctools][] = strongarm:strongarm:1 -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_instance][] = message-commons_like_user_likes_node-field_target_nodes features[message_type][] = commons_like_user_likes_node -features[variable][] = rate_widgets \ No newline at end of file diff --git a/modules/commons/commons_location/commons_location.features.field_base.inc b/modules/commons/commons_location/commons_location.features.field_base.inc index 01a6ebe3e6e49e8b1b6cb9bd430c00f5b468bf89..565a109bedf6290c025e8330a37e9cc0cddd1032 100644 --- a/modules/commons/commons_location/commons_location.features.field_base.inc +++ b/modules/commons/commons_location/commons_location.features.field_base.inc @@ -12,17 +12,17 @@ function commons_location_field_default_field_bases() { // Exported field_base: 'field_address' $field_bases['field_address'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_address', 'foreign keys' => array(), 'indexes' => array(), - 'locked' => '0', + 'locked' => 0, 'module' => 'addressfield', 'settings' => array(), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'addressfield', ); diff --git a/modules/commons/commons_location/commons_location.info b/modules/commons/commons_location/commons_location.info index ff1c02a60d46035d0fdd1496bae8d6873826a472..c9a99747d5fbd4a34c3fdba0512677ba717b974e 100644 --- a/modules/commons/commons_location/commons_location.info +++ b/modules/commons/commons_location/commons_location.info @@ -1,11 +1,9 @@ name = Commons Location description = Provide a field definition for locations. +core = 7.x package = Commons - Building Blocks -core= 7.x - -dependencies[] = features dependencies[] = addressfield +dependencies[] = features dependencies[] = field_sql_storage - -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_base][] = field_address diff --git a/modules/commons/commons_pages/commons_pages.features.field_instance.inc b/modules/commons/commons_pages/commons_pages.features.field_instance.inc index 78dc6069c8dc80466acc6ce917ce38130b26212f..2caa0033f61884ae676d3c11cfaf29ea9c27fb20 100644 --- a/modules/commons/commons_pages/commons_pages.features.field_instance.inc +++ b/modules/commons/commons_pages/commons_pages.features.field_instance.inc @@ -14,7 +14,7 @@ function commons_pages_field_default_field_instances() { $field_instances['node-page-body'] = array( 'bundle' => 'page', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( diff --git a/modules/commons/commons_pages/commons_pages.features.inc b/modules/commons/commons_pages/commons_pages.features.inc index afea6676a43f3857157ad28e20bdb1608a8263a0..a5472aae590ed708e4141cafb2c9bd7489607f86 100644 --- a/modules/commons/commons_pages/commons_pages.features.inc +++ b/modules/commons/commons_pages/commons_pages.features.inc @@ -7,8 +7,7 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_pages_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_pages_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } @@ -22,7 +21,7 @@ function commons_pages_node_info() { 'page' => array( 'name' => t('Page'), 'base' => 'node_content', - 'description' => "Use basic pages for your static content, such as an 'About us' page.", + 'description' => t('Use basic pages for your static content, such as an \'About us\' page.'), 'has_title' => '1', 'title_label' => t('Title'), 'help' => '', diff --git a/modules/commons/commons_pages/commons_pages.info b/modules/commons/commons_pages/commons_pages.info index 51ac36e4619d58d1f7e7837a9e9a95b3e157cf8c..432107dc0b7edcc46dd53d4e976ed4e57cafc3a2 100644 --- a/modules/commons/commons_pages/commons_pages.info +++ b/modules/commons/commons_pages/commons_pages.info @@ -2,13 +2,14 @@ name = Commons Pages core = 7.x package = Commons - Content types dependencies[] = commons_body +dependencies[] = commons_bw dependencies[] = ctools dependencies[] = features dependencies[] = node dependencies[] = strongarm dependencies[] = text features[ctools][] = strongarm:strongarm:1 -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_instance][] = node-page-body features[node][] = page features[variable][] = comment_anonymous_page @@ -23,4 +24,4 @@ features[variable][] = menu_parent_page features[variable][] = node_options_page features[variable][] = node_preview_page features[variable][] = node_submitted_page -features[variable][] = pathauto_node_page_pattern \ No newline at end of file +features[variable][] = pathauto_node_page_pattern diff --git a/modules/commons/commons_polls/commons_polls.features.field_instance.inc b/modules/commons/commons_polls/commons_polls.features.field_instance.inc index d772823492e7e1fbd04a3b4a32962f70decee445..9ba1622e4b5768e4c53a2d78351880ee8519276a 100644 --- a/modules/commons/commons_polls/commons_polls.features.field_instance.inc +++ b/modules/commons/commons_polls/commons_polls.features.field_instance.inc @@ -14,7 +14,7 @@ function commons_polls_field_default_field_instances() { $field_instances['node-poll-body'] = array( 'bundle' => 'poll', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -41,18 +41,18 @@ function commons_polls_field_default_field_instances() { 'required' => 0, 'settings' => array( 'display_summary' => 0, - 'text_processing' => '1', + 'text_processing' => 1, 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, 'module' => 'text', 'settings' => array( - 'rows' => '20', + 'rows' => 20, 'summary_rows' => 5, ), 'type' => 'text_textarea_with_summary', - 'weight' => '2', + 'weight' => 2, ), ); diff --git a/modules/commons/commons_polls/commons_polls.features.inc b/modules/commons/commons_polls/commons_polls.features.inc index 87d3643de3246f2a97e460aafe09877d168ef694..a8ce91e77b0ae8bd05504bffbf6877012646d874 100644 --- a/modules/commons/commons_polls/commons_polls.features.inc +++ b/modules/commons/commons_polls/commons_polls.features.inc @@ -7,8 +7,7 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_polls_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_polls_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } @@ -17,6 +16,6 @@ function commons_polls_ctools_plugin_api() { /** * Implements hook_views_api(). */ -function commons_polls_views_api() { +function commons_polls_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } diff --git a/modules/commons/commons_polls/commons_polls.features.user_permission.inc b/modules/commons/commons_polls/commons_polls.features.user_permission.inc index 02d54afe399eeb8a13f638f8663b3344d704c28d..aa3ee3d08d77e320b7a8329f4d14a37d6e251f60 100644 --- a/modules/commons/commons_polls/commons_polls.features.user_permission.inc +++ b/modules/commons/commons_polls/commons_polls.features.user_permission.inc @@ -10,7 +10,7 @@ function commons_polls_user_default_permissions() { $permissions = array(); - // Exported permission: cancel own vote. + // Exported permission: 'cancel own vote'. $permissions['cancel own vote'] = array( 'name' => 'cancel own vote', 'roles' => array( @@ -20,7 +20,7 @@ function commons_polls_user_default_permissions() { 'module' => 'poll', ); - // Exported permission: create poll content. + // Exported permission: 'create poll content'. $permissions['create poll content'] = array( 'name' => 'create poll content', 'roles' => array( @@ -30,7 +30,7 @@ function commons_polls_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete any poll content. + // Exported permission: 'delete any poll content'. $permissions['delete any poll content'] = array( 'name' => 'delete any poll content', 'roles' => array( @@ -39,7 +39,7 @@ function commons_polls_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete own poll content. + // Exported permission: 'delete own poll content'. $permissions['delete own poll content'] = array( 'name' => 'delete own poll content', 'roles' => array( @@ -49,7 +49,7 @@ function commons_polls_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit any poll content. + // Exported permission: 'edit any poll content'. $permissions['edit any poll content'] = array( 'name' => 'edit any poll content', 'roles' => array( @@ -58,7 +58,7 @@ function commons_polls_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit own poll content. + // Exported permission: 'edit own poll content'. $permissions['edit own poll content'] = array( 'name' => 'edit own poll content', 'roles' => array( @@ -68,7 +68,7 @@ function commons_polls_user_default_permissions() { 'module' => 'node', ); - // Exported permission: vote on polls. + // Exported permission: 'vote on polls'. $permissions['vote on polls'] = array( 'name' => 'vote on polls', 'roles' => array( diff --git a/modules/commons/commons_polls/commons_polls.info b/modules/commons/commons_polls/commons_polls.info index 0a23cce4b9de63e0c8d47b3ee370aafa681892d5..65aa0411052e9d128092b7d2a2fdf2bff4b9cd3b 100644 --- a/modules/commons/commons_polls/commons_polls.info +++ b/modules/commons/commons_polls/commons_polls.info @@ -2,7 +2,6 @@ name = Commons Polls description = Commons poll content type core = 7.x package = Commons - Content types -php = 5.2.4 project = commons_polls dependencies[] = commons_body dependencies[] = commons_topics @@ -18,7 +17,7 @@ dependencies[] = views dependencies[] = views_litepager features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_instance][] = node-poll-body features[og_features_permission][] = node:group:create poll content features[og_features_permission][] = node:group:delete any poll content diff --git a/modules/commons/commons_polls/commons_polls.views_default.inc b/modules/commons/commons_polls/commons_polls.views_default.inc index 81e452ab983bd903723df266600ec2d3bbb14bb4..63d51dfae49b1302132374033ef2441857cf2f29 100644 --- a/modules/commons/commons_polls/commons_polls.views_default.inc +++ b/modules/commons/commons_polls/commons_polls.views_default.inc @@ -32,7 +32,7 @@ function commons_polls_views_default_views() { $handler->display->display_options['pager']['type'] = 'lite'; $handler->display->display_options['pager']['options']['items_per_page'] = '10'; $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['pager']['options']['id'] = '0'; + $handler->display->display_options['pager']['options']['id'] = 2; $handler->display->display_options['pager']['options']['quantity'] = '9'; $handler->display->display_options['style_plugin'] = 'default'; $handler->display->display_options['row_plugin'] = 'node'; diff --git a/modules/commons/commons_posts/commons_posts.features.field_instance.inc b/modules/commons/commons_posts/commons_posts.features.field_instance.inc index 48cdf378fcb336a5fa6473d8c5e56946a89d35ed..66591ace42a86145ead54858abea01a26baae3af 100644 --- a/modules/commons/commons_posts/commons_posts.features.field_instance.inc +++ b/modules/commons/commons_posts/commons_posts.features.field_instance.inc @@ -15,14 +15,14 @@ function commons_posts_field_default_field_instances() { 'bundle' => 'commons_posts_post_created', 'default_value' => NULL, 'default_value_function' => '', - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( 'label' => 'hidden', 'settings' => array(), 'type' => 'hidden', - 'weight' => '0', + 'weight' => 0, ), 'message_notify_email_body' => array( 'label' => 'above', @@ -55,10 +55,10 @@ function commons_posts_field_default_field_instances() { 'settings' => array( 'match_operator' => 'CONTAINS', 'path' => '', - 'size' => '60', + 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => '2', + 'weight' => 2, ), ); @@ -66,7 +66,7 @@ function commons_posts_field_default_field_instances() { $field_instances['node-post-body'] = array( 'bundle' => 'post', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -93,18 +93,18 @@ function commons_posts_field_default_field_instances() { 'required' => 0, 'settings' => array( 'display_summary' => 0, - 'text_processing' => '1', + 'text_processing' => 1, 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, 'module' => 'text', 'settings' => array( - 'rows' => '20', + 'rows' => 20, 'summary_rows' => 5, ), 'type' => 'text_textarea_with_summary', - 'weight' => '2', + 'weight' => 2, ), ); diff --git a/modules/commons/commons_posts/commons_posts.features.inc b/modules/commons/commons_posts/commons_posts.features.inc index 2df2f6bd618d3cf5f295bd9b69521e1d7fcb9a28..bf03f79610fe1d1882eb0c457868d1af1e7220ca 100644 --- a/modules/commons/commons_posts/commons_posts.features.inc +++ b/modules/commons/commons_posts/commons_posts.features.inc @@ -7,8 +7,7 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_posts_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_posts_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } @@ -17,7 +16,7 @@ function commons_posts_ctools_plugin_api() { /** * Implements hook_views_api(). */ -function commons_posts_views_api() { +function commons_posts_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } @@ -42,9 +41,9 @@ function commons_posts_default_message_type() { "safe_value" : "[message:user:picture:35x35]" }, { - "value" : "\u003Ca href=\u0022[message:user:url:absolute]\u0022\u003E[message:user:name]\u003C\/a\u003E posted \u003Ca href=\u0022[message:field-target-nodes:0:url]\u0022\u003E[message:field-target-nodes:0:title]\u003C\/a\u003E", + "value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E posted \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title]\\u003C\\/a\\u003E", "format" : "full_html", - "safe_value" : "\u003Ca href=\u0022[message:user:url:absolute]\u0022\u003E[message:user:name]\u003C\/a\u003E posted \u003Ca href=\u0022[message:field-target-nodes:0:url]\u0022\u003E[message:field-target-nodes:0:title]\u003C\/a\u003E" + "safe_value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E posted \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title]\\u003C\\/a\\u003E" }, { "value" : "[commons-groups:in-groups-text]", diff --git a/modules/commons/commons_posts/commons_posts.features.user_permission.inc b/modules/commons/commons_posts/commons_posts.features.user_permission.inc index 291d28bf5d8adc4c8efacd87974572d373000266..f3eccb22e4b7112cbca26874f03dd405b10134d0 100644 --- a/modules/commons/commons_posts/commons_posts.features.user_permission.inc +++ b/modules/commons/commons_posts/commons_posts.features.user_permission.inc @@ -10,7 +10,7 @@ function commons_posts_user_default_permissions() { $permissions = array(); - // Exported permission: create post content. + // Exported permission: 'create post content'. $permissions['create post content'] = array( 'name' => 'create post content', 'roles' => array( @@ -20,7 +20,7 @@ function commons_posts_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete any post content. + // Exported permission: 'delete any post content'. $permissions['delete any post content'] = array( 'name' => 'delete any post content', 'roles' => array( @@ -29,7 +29,7 @@ function commons_posts_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete own post content. + // Exported permission: 'delete own post content'. $permissions['delete own post content'] = array( 'name' => 'delete own post content', 'roles' => array( @@ -39,7 +39,7 @@ function commons_posts_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit any post content. + // Exported permission: 'edit any post content'. $permissions['edit any post content'] = array( 'name' => 'edit any post content', 'roles' => array( @@ -48,7 +48,7 @@ function commons_posts_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit own post content. + // Exported permission: 'edit own post content'. $permissions['edit own post content'] = array( 'name' => 'edit own post content', 'roles' => array( diff --git a/modules/commons/commons_posts/commons_posts.info b/modules/commons/commons_posts/commons_posts.info index d88c10f8ada2077bd92122ea3987bee8606bdf8f..dddb5c126859ecfa0b105fb3bf3808c4a65531af 100644 --- a/modules/commons/commons_posts/commons_posts.info +++ b/modules/commons/commons_posts/commons_posts.info @@ -2,7 +2,6 @@ name = Commons Posts description = Commons Post content type core = 7.x package = Commons - Content types -php = 5.2.4 project = commons_posts dependencies[] = commons_body dependencies[] = commons_bw @@ -22,7 +21,7 @@ dependencies[] = views dependencies[] = views_litepager features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_instance][] = message-commons_posts_post_created-field_target_nodes features[field_instance][] = node-post-body features[message_type][] = commons_posts_post_created diff --git a/modules/commons/commons_posts/commons_posts.views_default.inc b/modules/commons/commons_posts/commons_posts.views_default.inc index ebdf07a7406a6f42c69091d5383244ab6ba2dd2f..1f5374883eb5d2c8d47421921914fddc56e29af1 100644 --- a/modules/commons/commons_posts/commons_posts.views_default.inc +++ b/modules/commons/commons_posts/commons_posts.views_default.inc @@ -32,7 +32,7 @@ function commons_posts_views_default_views() { $handler->display->display_options['pager']['type'] = 'lite'; $handler->display->display_options['pager']['options']['items_per_page'] = '10'; $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['pager']['options']['id'] = '0'; + $handler->display->display_options['pager']['options']['id'] = 3; $handler->display->display_options['pager']['options']['quantity'] = '9'; $handler->display->display_options['style_plugin'] = 'default'; $handler->display->display_options['row_plugin'] = 'node'; diff --git a/modules/commons/commons_q_a/commons_q_a.features.field_base.inc b/modules/commons/commons_q_a/commons_q_a.features.field_base.inc index 96cc0aae7f0f98091d8793fb1de3c9781cc6ca41..c8e30b8fbc8a1b70616abfa5dc1d00e8ec4f5279 100644 --- a/modules/commons/commons_q_a/commons_q_a.features.field_base.inc +++ b/modules/commons/commons_q_a/commons_q_a.features.field_base.inc @@ -12,9 +12,9 @@ function commons_q_a_field_default_field_bases() { // Exported field_base: 'field_related_question' $field_bases['field_related_question'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_related_question', 'foreign keys' => array( @@ -30,7 +30,7 @@ function commons_q_a_field_default_field_bases() { 0 => 'target_id', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'entityreference', 'settings' => array( 'handler' => 'base', @@ -49,7 +49,7 @@ function commons_q_a_field_default_field_bases() { ), 'target_type' => 'node', ), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'entityreference', ); diff --git a/modules/commons/commons_q_a/commons_q_a.features.field_instance.inc b/modules/commons/commons_q_a/commons_q_a.features.field_instance.inc index fabdee9ae253e8ea708bd3327fc68d163dd0a542..adacf7bbf5584df6a4cc67c1375a10cddfcd738a 100644 --- a/modules/commons/commons_q_a/commons_q_a.features.field_instance.inc +++ b/modules/commons/commons_q_a/commons_q_a.features.field_instance.inc @@ -67,14 +67,14 @@ function commons_q_a_field_default_field_instances() { 'bundle' => 'commons_q_a_question_asked', 'default_value' => NULL, 'default_value_function' => '', - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '3', + 'weight' => 3, ), 'message_notify_email_body' => array( 'label' => 'above', @@ -107,10 +107,10 @@ function commons_q_a_field_default_field_instances() { 'settings' => array( 'match_operator' => 'CONTAINS', 'path' => '', - 'size' => '60', + 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => '2', + 'weight' => 2, ), ); @@ -118,7 +118,7 @@ function commons_q_a_field_default_field_instances() { $field_instances['node-answer-body'] = array( 'bundle' => 'answer', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -154,7 +154,7 @@ function commons_q_a_field_default_field_instances() { 'summary_rows' => 5, ), 'type' => 'text_textarea_with_summary', - 'weight' => '-4', + 'weight' => -4, ), ); @@ -163,7 +163,7 @@ function commons_q_a_field_default_field_instances() { 'bundle' => 'answer', 'default_value' => NULL, 'default_value_function' => 'entityreference_prepopulate_field_default_value', - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -192,7 +192,7 @@ function commons_q_a_field_default_field_instances() { 'action' => 'disable', 'fallback' => 'form_error', 'og_context' => 0, - 'skip_perm' => '0', + 'skip_perm' => 0, 'status' => 1, ), ), @@ -204,10 +204,10 @@ function commons_q_a_field_default_field_instances() { 'settings' => array( 'match_operator' => 'CONTAINS', 'path' => '', - 'size' => '60', + 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => '4', + 'weight' => 4, ), ); @@ -215,7 +215,7 @@ function commons_q_a_field_default_field_instances() { $field_instances['node-question-body'] = array( 'bundle' => 'question', 'default_value' => NULL, - 'deleted' => '0', + 'deleted' => 0, 'description' => '', 'display' => array( 'default' => array( @@ -242,18 +242,18 @@ function commons_q_a_field_default_field_instances() { 'required' => 0, 'settings' => array( 'display_summary' => 0, - 'text_processing' => '1', + 'text_processing' => 1, 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, 'module' => 'text', 'settings' => array( - 'rows' => '20', + 'rows' => 20, 'summary_rows' => 5, ), 'type' => 'text_textarea_with_summary', - 'weight' => '1', + 'weight' => 1, ), ); diff --git a/modules/commons/commons_q_a/commons_q_a.features.inc b/modules/commons/commons_q_a/commons_q_a.features.inc index 4f76aa8ba7c4666df7a99449c8cc9bc02b1251fd..994358d069d0dec46bd5171ab1b80ed2506227c3 100644 --- a/modules/commons/commons_q_a/commons_q_a.features.inc +++ b/modules/commons/commons_q_a/commons_q_a.features.inc @@ -7,12 +7,10 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_q_a_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_q_a_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "panelizer" && $api == "panelizer") { return array("version" => "1"); } - list($module, $api) = func_get_args(); if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } @@ -21,7 +19,7 @@ function commons_q_a_ctools_plugin_api() { /** * Implements hook_views_api(). */ -function commons_q_a_views_api() { +function commons_q_a_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } @@ -32,7 +30,7 @@ function commons_q_a_default_message_type() { $items = array(); $items['commons_q_a_question_answered'] = entity_import('message_type', '{ "name" : "commons_q_a_question_answered", - "description" : "Commons Q\u0026A: Question Answered", + "description" : "Commons Q\\u0026A: Question Answered", "argument_keys" : [], "argument" : [], "category" : "message_type", @@ -46,9 +44,9 @@ function commons_q_a_default_message_type() { "safe_value" : "[message:user:picture:35x35]" }, { - "value" : "\u003Ca href=\u0022[message:user:url:absolute]\u0022\u003E[message:user:name]\u003C\/a\u003E answered the question \u003Cem\u003E[message:field-target-nodes:0:field-related-question:title]\u003C\/em\u003E with \u0022\u003Ca href=\u0022[message:field-target-nodes:0:field-related-question:url]#node-[message:field-target-nodes:0:nid]\u0022\u003E[message:field-target-nodes:0:title]\u003C\/a\u003E\u0022", + "value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E answered the question \\u003Cem\\u003E[message:field-target-nodes:0:field-related-question:title]\\u003C\\/em\\u003E with \\u0022\\u003Ca href=\\u0022[message:field-target-nodes:0:field-related-question:url]#node-[message:field-target-nodes:0:nid]\\u0022\\u003E[message:field-target-nodes:0:title]\\u003C\\/a\\u003E\\u0022", "format" : "full_html", - "safe_value" : "\u003Ca href=\u0022[message:user:url:absolute]\u0022\u003E[message:user:name]\u003C\/a\u003E answered the question \u003Cem\u003E[message:field-target-nodes:0:field-related-question:title]\u003C\/em\u003E with \u0022\u003Ca href=\u0022[message:field-target-nodes:0:field-related-question:url]#node-[message:field-target-nodes:0:nid]\u0022\u003E[message:field-target-nodes:0:title]\u003C\/a\u003E\u0022" + "safe_value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E answered the question \\u003Cem\\u003E[message:field-target-nodes:0:field-related-question:title]\\u003C\\/em\\u003E with \\u0022\\u003Ca href=\\u0022[message:field-target-nodes:0:field-related-question:url]#node-[message:field-target-nodes:0:nid]\\u0022\\u003E[message:field-target-nodes:0:title]\\u003C\\/a\\u003E\\u0022" }, { "value" : "[commons-groups:in-groups-text]", @@ -61,7 +59,7 @@ function commons_q_a_default_message_type() { }'); $items['commons_q_a_question_asked'] = entity_import('message_type', '{ "name" : "commons_q_a_question_asked", - "description" : "Commons Q\u0026A: Question Asked", + "description" : "Commons Q\\u0026A: Question Asked", "argument_keys" : [], "argument" : [], "category" : "message_type", @@ -75,9 +73,9 @@ function commons_q_a_default_message_type() { "safe_value" : "[message:user:picture:35x35]" }, { - "value" : "\u003Ca href=\u0022[message:user:url:absolute]\u0022\u003E[message:user:name]\u003C\/a\u003E asked the question \u003Ca href=\u0022[message:field-target-nodes:0:url]\u0022\u003E[message:field-target-nodes:0:title]\u003C\/a\u003E", + "value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E asked the question \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title]\\u003C\\/a\\u003E", "format" : "full_html", - "safe_value" : "\u003Ca href=\u0022[message:user:url:absolute]\u0022\u003E[message:user:name]\u003C\/a\u003E asked the question \u003Ca href=\u0022[message:field-target-nodes:0:url]\u0022\u003E[message:field-target-nodes:0:title]\u003C\/a\u003E" + "safe_value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E asked the question \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title]\\u003C\\/a\\u003E" }, { "value" : "[commons-groups:in-groups-text]", @@ -99,7 +97,7 @@ function commons_q_a_node_info() { 'answer' => array( 'name' => t('Answer'), 'base' => 'node_content', - 'description' => 'Use answers for responses to Question content, which can be rated by user votes.', + 'description' => t('Use answers for responses to Question content, which can be rated by user votes.'), 'has_title' => '1', 'title_label' => t('Title'), 'help' => '', @@ -107,7 +105,7 @@ function commons_q_a_node_info() { 'question' => array( 'name' => t('Question'), 'base' => 'node_content', - 'description' => 'Ask a question to receive answers from other community members', + 'description' => t('Ask a question to receive answers from other community members'), 'has_title' => '1', 'title_label' => t('Title'), 'help' => '', diff --git a/modules/commons/commons_q_a/commons_q_a.features.user_permission.inc b/modules/commons/commons_q_a/commons_q_a.features.user_permission.inc index 93d5569227920556b70e67e376b6ef52e9febed0..758a4bbff4f988365d0358b39bd5f6444412d4f9 100644 --- a/modules/commons/commons_q_a/commons_q_a.features.user_permission.inc +++ b/modules/commons/commons_q_a/commons_q_a.features.user_permission.inc @@ -10,7 +10,7 @@ function commons_q_a_user_default_permissions() { $permissions = array(); - // Exported permission: create answer content. + // Exported permission: 'create answer content'. $permissions['create answer content'] = array( 'name' => 'create answer content', 'roles' => array( @@ -20,7 +20,7 @@ function commons_q_a_user_default_permissions() { 'module' => 'node', ); - // Exported permission: create question content. + // Exported permission: 'create question content'. $permissions['create question content'] = array( 'name' => 'create question content', 'roles' => array( @@ -30,7 +30,7 @@ function commons_q_a_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete any answer content. + // Exported permission: 'delete any answer content'. $permissions['delete any answer content'] = array( 'name' => 'delete any answer content', 'roles' => array( @@ -39,7 +39,7 @@ function commons_q_a_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete any question content. + // Exported permission: 'delete any question content'. $permissions['delete any question content'] = array( 'name' => 'delete any question content', 'roles' => array( @@ -48,7 +48,7 @@ function commons_q_a_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete own answer content. + // Exported permission: 'delete own answer content'. $permissions['delete own answer content'] = array( 'name' => 'delete own answer content', 'roles' => array( @@ -58,7 +58,7 @@ function commons_q_a_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete own question content. + // Exported permission: 'delete own question content'. $permissions['delete own question content'] = array( 'name' => 'delete own question content', 'roles' => array( @@ -68,7 +68,7 @@ function commons_q_a_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit any answer content. + // Exported permission: 'edit any answer content'. $permissions['edit any answer content'] = array( 'name' => 'edit any answer content', 'roles' => array( @@ -77,7 +77,7 @@ function commons_q_a_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit any question content. + // Exported permission: 'edit any question content'. $permissions['edit any question content'] = array( 'name' => 'edit any question content', 'roles' => array( @@ -86,7 +86,7 @@ function commons_q_a_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit own answer content. + // Exported permission: 'edit own answer content'. $permissions['edit own answer content'] = array( 'name' => 'edit own answer content', 'roles' => array( @@ -96,7 +96,7 @@ function commons_q_a_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit own question content. + // Exported permission: 'edit own question content'. $permissions['edit own question content'] = array( 'name' => 'edit own question content', 'roles' => array( diff --git a/modules/commons/commons_q_a/commons_q_a.info b/modules/commons/commons_q_a/commons_q_a.info index f28128f739d9cdcc6559e15e4993bd3bbf6a201b..a63687cb9e49dd73c05493eee95df4392b53767c 100644 --- a/modules/commons/commons_q_a/commons_q_a.info +++ b/modules/commons/commons_q_a/commons_q_a.info @@ -2,7 +2,6 @@ name = Commons Q&A description = Allows community members to ask questions and vote for the best answers core = 7.x package = Commons - Content types -php = 5.2.4 project = commons_q_a dependencies[] = commons_topics dependencies[] = ctools @@ -20,11 +19,10 @@ dependencies[] = views_litepager features[ctools][] = panelizer:panelizer:1 features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_base][] = field_related_question features[field_instance][] = message-commons_q_a_question_answered-field_target_nodes features[field_instance][] = message-commons_q_a_question_asked-field_target_nodes -features_exclude[field][message-commons_q_a_question_answered-field_target_nodes] = message-commons_q_a_question_answered-field_target_nodes features[field_instance][] = node-answer-body features[field_instance][] = node-answer-field_related_question features[field_instance][] = node-question-body @@ -83,6 +81,7 @@ features[variable][] = node_submitted_question features[views_view][] = commons_bw_q_a features[views_view][] = commons_question_answers features_exclude[dependencies][message] = message +features_exclude[field][message-commons_q_a_question_answered-field_target_nodes] = message-commons_q_a_question_answered-field_target_nodes features_exclude[field_base][og_group_ref_other_groups] = og_group_ref_other_groups features_exclude[field_base][og_group_ref] = og_group_ref features_exclude[field_base][field_body] = field_body diff --git a/modules/commons/commons_q_a/commons_q_a.strongarm.inc b/modules/commons/commons_q_a/commons_q_a.strongarm.inc index abe4b208f6cd3b13d848d1c967b2ace290924608..623db62cba9ead2a6e91fccde6970636bc23bef6 100644 --- a/modules/commons/commons_q_a/commons_q_a.strongarm.inc +++ b/modules/commons/commons_q_a/commons_q_a.strongarm.inc @@ -13,70 +13,6 @@ function commons_q_a_strongarm() { $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'field_bundle_settings_message__commons_q_a_question_answered'; - $strongarm->value = array( - 'view_modes' => array( - 'message_notify_email_subject' => array( - 'custom_settings' => TRUE, - ), - 'message_notify_email_body' => array( - 'custom_settings' => TRUE, - ), - 'full' => array( - 'custom_settings' => FALSE, - ), - 'diff_standard' => array( - 'custom_settings' => FALSE, - ), - 'token' => array( - 'custom_settings' => FALSE, - ), - ), - 'extra_fields' => array( - 'form' => array(), - 'display' => array( - 'message__message_text__0' => array( - 'message_notify_email_subject' => array( - 'visible' => TRUE, - 'weight' => 0, - ), - 'message_notify_email_body' => array( - 'visible' => FALSE, - 'weight' => 0, - ), - 'default' => array( - 'weight' => '0', - 'visible' => TRUE, - ), - ), - 'message__message_text__1' => array( - 'message_notify_email_subject' => array( - 'visible' => FALSE, - 'weight' => 0, - ), - 'message_notify_email_body' => array( - 'visible' => TRUE, - 'weight' => 0, - ), - 'default' => array( - 'weight' => '1', - 'visible' => TRUE, - ), - ), - 'message__message_text__2' => array( - 'default' => array( - 'weight' => '2', - 'visible' => TRUE, - ), - ), - ), - ), - ); - $export['field_bundle_settings_message__commons_q_a_question_answered'] = $strongarm; - - $strongarm = new stdClass(); - $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ - $strongarm->api_version = 1; $strongarm->name = 'comment_anonymous_answer'; $strongarm->value = 0; $export['comment_anonymous_answer'] = $strongarm; @@ -175,6 +111,104 @@ function commons_q_a_strongarm() { $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; + $strongarm->name = 'field_bundle_settings_message__commons_q_a_question_answered'; + $strongarm->value = array( + 'view_modes' => array( + 'message_notify_email_subject' => array( + 'custom_settings' => TRUE, + ), + 'message_notify_email_body' => array( + 'custom_settings' => TRUE, + ), + 'full' => array( + 'custom_settings' => FALSE, + ), + 'diff_standard' => array( + 'custom_settings' => FALSE, + ), + 'token' => array( + 'custom_settings' => FALSE, + ), + ), + 'extra_fields' => array( + 'form' => array(), + 'display' => array( + 'message__message_text__0' => array( + 'message_notify_email_subject' => array( + 'visible' => TRUE, + 'weight' => 0, + ), + 'message_notify_email_body' => array( + 'visible' => FALSE, + 'weight' => 0, + ), + 'default' => array( + 'weight' => '0', + 'visible' => TRUE, + ), + ), + 'message__message_text__1' => array( + 'message_notify_email_subject' => array( + 'visible' => FALSE, + 'weight' => 0, + ), + 'message_notify_email_body' => array( + 'visible' => TRUE, + 'weight' => 0, + ), + 'default' => array( + 'weight' => '1', + 'visible' => TRUE, + ), + ), + 'message__message_text__2' => array( + 'default' => array( + 'weight' => '2', + 'visible' => TRUE, + ), + ), + ), + ), + ); + $export['field_bundle_settings_message__commons_q_a_question_answered'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'field_bundle_settings_message__commons_q_a_question_asked'; + $strongarm->value = array( + 'view_modes' => array(), + 'extra_fields' => array( + 'form' => array(), + 'display' => array( + 'message__message_text__0' => array( + 'message_notify_email_subject' => array( + 'visible' => TRUE, + 'weight' => 0, + ), + 'message_notify_email_body' => array( + 'visible' => FALSE, + 'weight' => 0, + ), + ), + 'message__message_text__1' => array( + 'message_notify_email_subject' => array( + 'visible' => FALSE, + 'weight' => 0, + ), + 'message_notify_email_body' => array( + 'visible' => TRUE, + 'weight' => 0, + ), + ), + ), + ), + ); + $export['field_bundle_settings_message__commons_q_a_question_asked'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; $strongarm->name = 'field_bundle_settings_node__answer'; $strongarm->value = array( 'view_modes' => array(), diff --git a/modules/commons/commons_q_a/commons_q_a.views_default.inc b/modules/commons/commons_q_a/commons_q_a.views_default.inc index fdf9d00a80715a2be008d452bfdc8a0c86777250..458c3a585bd7d512854196667eab84145453dc18 100644 --- a/modules/commons/commons_q_a/commons_q_a.views_default.inc +++ b/modules/commons/commons_q_a/commons_q_a.views_default.inc @@ -31,7 +31,7 @@ function commons_q_a_views_default_views() { $handler->display->display_options['pager']['type'] = 'lite'; $handler->display->display_options['pager']['options']['items_per_page'] = '10'; $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['pager']['options']['id'] = '0'; + $handler->display->display_options['pager']['options']['id'] = 4; $handler->display->display_options['pager']['options']['quantity'] = '9'; $handler->display->display_options['style_plugin'] = 'default'; $handler->display->display_options['row_plugin'] = 'entity'; diff --git a/modules/commons/commons_q_a/modules/commons_q_a_pages/commons_q_a_pages.features.inc b/modules/commons/commons_q_a/modules/commons_q_a_pages/commons_q_a_pages.features.inc index e9adbca797dcea5d727ae18a0557de46b16d54f5..7abcc63df4e65457bdd084e5c584ef258afea461 100644 --- a/modules/commons/commons_q_a/modules/commons_q_a_pages/commons_q_a_pages.features.inc +++ b/modules/commons/commons_q_a/modules/commons_q_a_pages/commons_q_a_pages.features.inc @@ -7,12 +7,10 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_q_a_pages_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_q_a_pages_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "panelizer" && $api == "panelizer") { return array("version" => "1"); } - list($module, $api) = func_get_args(); if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } diff --git a/modules/commons/commons_q_a/modules/commons_q_a_pages/commons_q_a_pages.info b/modules/commons/commons_q_a/modules/commons_q_a_pages/commons_q_a_pages.info index 10edb65f97123ecbcb6d099c48859970293b9664..deb6d34f3f8796d5cb12b7a78e2984216a7400d9 100644 --- a/modules/commons/commons_q_a/modules/commons_q_a_pages/commons_q_a_pages.info +++ b/modules/commons/commons_q_a/modules/commons_q_a_pages/commons_q_a_pages.info @@ -2,13 +2,12 @@ name = Commons Q&A Pages description = Page layout settings for individual Question and Answe pages core = 7.x package = Commons - Landing pages -php = 5.2.4 dependencies[] = ctools dependencies[] = panelizer dependencies[] = strongarm features[ctools][] = panelizer:panelizer:1 features[ctools][] = strongarm:strongarm:1 -features[features_api][] = api:1 +features[features_api][] = api:2 features[panelizer_defaults][] = node:question:default features[variable][] = panelizer_defaults_node_answer features[variable][] = panelizer_defaults_node_question diff --git a/modules/commons/commons_radioactivity/commons_radioactivity.features.field_base.inc b/modules/commons/commons_radioactivity/commons_radioactivity.features.field_base.inc index d29ef94f6bce62a63d5a56acdece8f01b711ec0b..cc539404602d2ba2bf0d110a8314a99fc23421c3 100644 --- a/modules/commons/commons_radioactivity/commons_radioactivity.features.field_base.inc +++ b/modules/commons/commons_radioactivity/commons_radioactivity.features.field_base.inc @@ -12,9 +12,9 @@ function commons_radioactivity_field_default_field_bases() { // Exported field_base: 'field_radioactivity' $field_bases['field_radioactivity'] = array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_radioactivity', 'foreign keys' => array(), @@ -23,10 +23,10 @@ function commons_radioactivity_field_default_field_bases() { 0 => 'radioactivity_energy', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'radioactivity', 'settings' => array(), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'radioactivity', ); diff --git a/modules/commons/commons_radioactivity/commons_radioactivity.features.inc b/modules/commons/commons_radioactivity/commons_radioactivity.features.inc index f144697ea04e2b54f95a7b89b15d11aca7d19d2e..82ef197520115cec331b59b97994cbab4716484b 100644 --- a/modules/commons/commons_radioactivity/commons_radioactivity.features.inc +++ b/modules/commons/commons_radioactivity/commons_radioactivity.features.inc @@ -7,12 +7,10 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_radioactivity_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_radioactivity_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "radioactivity" && $api == "radioactivity_decay_profile") { return array("version" => "1"); } - list($module, $api) = func_get_args(); if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } @@ -21,6 +19,6 @@ function commons_radioactivity_ctools_plugin_api() { /** * Implements hook_views_api(). */ -function commons_radioactivity_views_api() { +function commons_radioactivity_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } diff --git a/modules/commons/commons_radioactivity/commons_radioactivity.info b/modules/commons/commons_radioactivity/commons_radioactivity.info index 458f880cf9258191aef3129f1566cada10f44444..6e31f19f6b9af2e90a9c0bf372301491d194d042 100644 --- a/modules/commons/commons_radioactivity/commons_radioactivity.info +++ b/modules/commons/commons_radioactivity/commons_radioactivity.info @@ -2,7 +2,6 @@ name = Commons Radioactivity description = Helps to identify interesting content by automatically determining a decaying radioactivity value for individual pieces of conte core = 7.x package = Commons - Building blocks -php = 5.2.4 project = commons_radioactivity dependencies[] = ctools dependencies[] = features @@ -14,7 +13,7 @@ datestamp = 1359684043 features[ctools][] = radioactivity:radioactivity_decay_profile:1 features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_base][] = field_radioactivity features[radioactivity_decay_profile][] = commons_ra_node features[variable][] = commons_radioactivity_entity_types diff --git a/modules/commons/commons_radioactivity/commons_radioactivity.strongarm.inc b/modules/commons/commons_radioactivity/commons_radioactivity.strongarm.inc index 173befa14a28f7e5991d4a947fa3e563065e8875..71389dfa02077765129126740bedc07e323bb6af 100644 --- a/modules/commons/commons_radioactivity/commons_radioactivity.strongarm.inc +++ b/modules/commons/commons_radioactivity/commons_radioactivity.strongarm.inc @@ -19,6 +19,7 @@ function commons_radioactivity_strongarm() { 'group' => 1, 'poll' => 1, 'post' => 1, + 'wiki' => 1, ), ); $export['commons_radioactivity_entity_types'] = $strongarm; diff --git a/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.features.inc b/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.features.inc index f073dff1c9be6ed1f65af5e4b8791f8fa76813d3..fd3ce078beb9b6ba7f9f6981862ee8512aca806e 100644 --- a/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.features.inc +++ b/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.features.inc @@ -7,6 +7,6 @@ /** * Implements hook_views_api(). */ -function commons_radioactivity_groups_views_api() { - return array("version" => "3.0"); +function commons_radioactivity_groups_views_api($module = NULL, $api = NULL) { + return array("api" => "3.0"); } diff --git a/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.info b/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.info index c28e98c800dba9da0f49b6aae6d4144028c4ce39..7c9549f14699eeaec7944fa9b4cd9fac1b8fa7bb 100644 --- a/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.info +++ b/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.info @@ -2,7 +2,6 @@ name = Commons Radioactivity Groups description = Views integration for Group radioactivity core = 7.x package = Commons - Building Blocks -php = 5.2.4 project = commons_radioactivity dependencies[] = commons_radioactivity dependencies[] = og @@ -10,6 +9,6 @@ dependencies[] = views_content dependencies[] = views_field_view datestamp = 1350676260 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[views_view][] = commons_radioactivity_groups_active_in_group features[views_view][] = commons_radioactivity_groups_most_active diff --git a/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.views_default.inc b/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.views_default.inc index 1a3274342ce44b61f63063b238de9392444eb592..5b412f5a2cbc4f56c507f2d8d4d0933cb6a36f5e 100644 --- a/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.views_default.inc +++ b/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.views_default.inc @@ -202,7 +202,7 @@ function commons_radioactivity_groups_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; - /* Filter criterion: Content: Group (group_group) */ + /* Filter criterion: Field: Group (group_group) */ $handler->display->display_options['filters']['group_group_value']['id'] = 'group_group_value'; $handler->display->display_options['filters']['group_group_value']['table'] = 'field_data_group_group'; $handler->display->display_options['filters']['group_group_value']['field'] = 'group_group_value'; diff --git a/modules/commons/commons_site_homepage/commons_site_homepage.features.inc b/modules/commons/commons_site_homepage/commons_site_homepage.features.inc index 45b1ef58839df7a7fdb07623c9e2ef2fe60f3597..2c9f02ad894c60e3276d1817d3c26cdd7c6bf818 100644 --- a/modules/commons/commons_site_homepage/commons_site_homepage.features.inc +++ b/modules/commons/commons_site_homepage/commons_site_homepage.features.inc @@ -7,12 +7,10 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_site_homepage_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_site_homepage_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "page_manager" && $api == "pages_default") { return array("version" => "1"); } - list($module, $api) = func_get_args(); if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } @@ -21,6 +19,6 @@ function commons_site_homepage_ctools_plugin_api() { /** * Implements hook_views_api(). */ -function commons_site_homepage_views_api() { +function commons_site_homepage_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } diff --git a/modules/commons/commons_site_homepage/commons_site_homepage.info b/modules/commons/commons_site_homepage/commons_site_homepage.info index 827619db88d76c1b90c3a5ede6af7b9edbdb7c5c..00f2e56bcb4e36ea96fbfe4186cdb59190fcaf30 100644 --- a/modules/commons/commons_site_homepage/commons_site_homepage.info +++ b/modules/commons/commons_site_homepage/commons_site_homepage.info @@ -2,7 +2,6 @@ name = Commons Site Homepage description = Provides a homepage for the site for anonymous and authenticated users core = 7.x package = Commons - Landing pages -php = 5.2.4 project = commons_site_homepage dependencies[] = commons_activity_streams dependencies[] = commons_events @@ -18,7 +17,7 @@ datestamp = 1354747296 features[ctools][] = page_manager:pages_default:1 features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 -features[features_api][] = api:1 +features[features_api][] = api:2 features[page_manager_pages][] = commons_home features[variable][] = site_frontpage features[views_view][] = commons_homepage_content diff --git a/modules/commons/commons_social_sharing/commons_social_sharing.features.inc b/modules/commons/commons_social_sharing/commons_social_sharing.features.inc index 95d29ebab838cea4cdbe54155e6fdd6333147bdd..4dc037003fbb1cde11ef8ff43f0aafe1d0d131f2 100644 --- a/modules/commons/commons_social_sharing/commons_social_sharing.features.inc +++ b/modules/commons/commons_social_sharing/commons_social_sharing.features.inc @@ -7,8 +7,7 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_social_sharing_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_social_sharing_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } diff --git a/modules/commons/commons_social_sharing/commons_social_sharing.info b/modules/commons/commons_social_sharing/commons_social_sharing.info index 43fd426ac7f46c851c217165c09e3911931f88a9..5c73212ffad4912980f9f6abb1e3196492b437c4 100644 --- a/modules/commons/commons_social_sharing/commons_social_sharing.info +++ b/modules/commons/commons_social_sharing/commons_social_sharing.info @@ -7,7 +7,7 @@ dependencies[] = ctools dependencies[] = sharethis dependencies[] = strongarm features[ctools][] = strongarm:strongarm:1 -features[features_api][] = api:1 +features[features_api][] = api:2 features[variable][] = sharethis_button_option features[variable][] = sharethis_comments features[variable][] = sharethis_late_load diff --git a/modules/commons/commons_topics/commons_topics.features.field_base.inc b/modules/commons/commons_topics/commons_topics.features.field_base.inc index 0b229b5d426cb00fc46783fedc50e309f2885c18..d43d7b9d5bf01a05bb056d3698062f89463f068d 100644 --- a/modules/commons/commons_topics/commons_topics.features.field_base.inc +++ b/modules/commons/commons_topics/commons_topics.features.field_base.inc @@ -12,9 +12,9 @@ function commons_topics_field_default_field_bases() { // Exported field_base: 'field_topics' $field_bases['field_topics'] = array( - 'active' => '1', - 'cardinality' => '-1', - 'deleted' => '0', + 'active' => 1, + 'cardinality' => -1, + 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_topics', 'foreign keys' => array( @@ -30,17 +30,17 @@ function commons_topics_field_default_field_bases() { 0 => 'tid', ), ), - 'locked' => '0', + 'locked' => 0, 'module' => 'taxonomy', 'settings' => array( 'allowed_values' => array( 0 => array( 'vocabulary' => 'topics', - 'parent' => '0', + 'parent' => 0, ), ), ), - 'translatable' => '0', + 'translatable' => 0, 'type' => 'taxonomy_term_reference', ); diff --git a/modules/commons/commons_topics/commons_topics.features.taxonomy.inc b/modules/commons/commons_topics/commons_topics.features.taxonomy.inc index 2d63cc829ea6b83e7dc2d2245bb1b9154c11ac51..1ca8d6fac630c2672d656df7fd821692769ceea6 100644 --- a/modules/commons/commons_topics/commons_topics.features.taxonomy.inc +++ b/modules/commons/commons_topics/commons_topics.features.taxonomy.inc @@ -13,9 +13,9 @@ function commons_topics_taxonomy_default_vocabularies() { 'name' => 'Topics', 'machine_name' => 'topics', 'description' => '', - 'hierarchy' => '0', + 'hierarchy' => 0, 'module' => 'taxonomy', - 'weight' => '0', + 'weight' => 0, 'rdf_mapping' => array( 'rdftype' => array( 0 => 'skos:ConceptScheme', diff --git a/modules/commons/commons_topics/commons_topics.info b/modules/commons/commons_topics/commons_topics.info index 7f3410056ef0be9fd99e01765e7458f3e002573e..337ca693f53c224455bb02d76f2879b363b6d2c4 100644 --- a/modules/commons/commons_topics/commons_topics.info +++ b/modules/commons/commons_topics/commons_topics.info @@ -1,11 +1,10 @@ name = Commons Topics core = 7.x package = Commons - Building blocks -php = 5.2.4 project = commons_topics dependencies[] = features dependencies[] = taxonomy datestamp = 1359684035 -features[features_api][] = api:1 +features[features_api][] = api:2 features[field_base][] = field_topics features[taxonomy][] = topics diff --git a/modules/commons/commons_user_profile_pages/commons_user_profile_pages.features.inc b/modules/commons/commons_user_profile_pages/commons_user_profile_pages.features.inc index a653d45071f3c9f59ba63436e9b48f65db61e765..f73c07aa5421a368a4c66604ea6fd2a1518c6aaa 100644 --- a/modules/commons/commons_user_profile_pages/commons_user_profile_pages.features.inc +++ b/modules/commons/commons_user_profile_pages/commons_user_profile_pages.features.inc @@ -7,8 +7,7 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_user_profile_pages_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_user_profile_pages_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "page_manager" && $api == "pages_default") { return array("version" => "1"); } diff --git a/modules/commons/commons_user_profile_pages/commons_user_profile_pages.info b/modules/commons/commons_user_profile_pages/commons_user_profile_pages.info index 8ac5caa7e2c99c33aa5cf6ccfccc7c8beeef3fe5..4e474cd3c9502a18c0683052a8c88410646e2b36 100644 --- a/modules/commons/commons_user_profile_pages/commons_user_profile_pages.info +++ b/modules/commons/commons_user_profile_pages/commons_user_profile_pages.info @@ -2,7 +2,6 @@ name = Commons User Profile Pages description = Exports a default user profile page, powered by the Panels module. core = 7.x package = Commons - Landing pages -php = 5.2.4 project = commons_user_profile_pages dependencies[] = commons_activity_streams dependencies[] = commons_events diff --git a/modules/commons/commons_wikis/commons_wikis.features.field_instance.inc b/modules/commons/commons_wikis/commons_wikis.features.field_instance.inc index 56f04cd8078191097552425f541c0939d35d4f14..2ffc70ff65d4a2d47ac987561b32340d6848cd9b 100644 --- a/modules/commons/commons_wikis/commons_wikis.features.field_instance.inc +++ b/modules/commons/commons_wikis/commons_wikis.features.field_instance.inc @@ -128,7 +128,7 @@ function commons_wikis_field_default_field_instances() { 'weight' => 0, ), ), - 'display_in_partial_form' => 1, + 'display_in_partial_form' => TRUE, 'entity_type' => 'node', 'field_name' => 'title_field', 'label' => 'Title', diff --git a/modules/commons/commons_wikis/commons_wikis.features.inc b/modules/commons/commons_wikis/commons_wikis.features.inc index 8d59e3d7c106d62aabf1b305863747f5072ae102..66b1e34acb838e23a8e306e4dcc139f3a0200dd5 100644 --- a/modules/commons/commons_wikis/commons_wikis.features.inc +++ b/modules/commons/commons_wikis/commons_wikis.features.inc @@ -7,12 +7,10 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_wikis_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_wikis_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "page_manager" && $api == "pages_default") { return array("version" => "1"); } - list($module, $api) = func_get_args(); if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } @@ -21,7 +19,7 @@ function commons_wikis_ctools_plugin_api() { /** * Implements hook_views_api(). */ -function commons_wikis_views_api() { +function commons_wikis_views_api($module = NULL, $api = NULL) { return array("api" => "3.0"); } @@ -46,9 +44,9 @@ function commons_wikis_default_message_type() { "safe_value" : "[message:user:picture:35x35]" }, { - "value" : "\u003Ca href=\u0022[message:user:url:absolute]\u0022\u003E[message:user:name]\u003C\/a\u003E has updated the \u003Ca href=\u0022[message:field-target-nodes:0:url]\u0022\u003E[message:field-target-nodes:0:title]\u003C\/a\u003E wiki page", + "value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E has updated the \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title]\\u003C\\/a\\u003E wiki page", "format" : "full_html", - "safe_value" : "\u003Ca href=\u0022[message:user:url:absolute]\u0022\u003E[message:user:name]\u003C\/a\u003E has updated the \u003Ca href=\u0022[message:field-target-nodes:0:url]\u0022\u003E[message:field-target-nodes:0:title]\u003C\/a\u003E wiki page" + "safe_value" : "\\u003Ca href=\\u0022[message:user:url:absolute]\\u0022\\u003E[message:user:name]\\u003C\\/a\\u003E has updated the \\u003Ca href=\\u0022[message:field-target-nodes:0:url]\\u0022\\u003E[message:field-target-nodes:0:title]\\u003C\\/a\\u003E wiki page" }, { "value" : "[commons-groups:in-groups-text]", @@ -70,7 +68,7 @@ function commons_wikis_node_info() { 'wiki' => array( 'name' => t('Wiki'), 'base' => 'node_content', - 'description' => 'Create a collaborative document, allowing users to add, delete, or revise content. Provides document version controls.', + 'description' => t('Create a collaborative document, allowing users to add, delete, or revise content. Provides document version controls.'), 'has_title' => '1', 'title_label' => t('Title'), 'help' => '', diff --git a/modules/commons/commons_wikis/commons_wikis.features.user_permission.inc b/modules/commons/commons_wikis/commons_wikis.features.user_permission.inc index 4137f9682671cedb685d96dd2c77037dfdea89f0..456a93fd771468c8c1bd650e8c68ce8b7584ef61 100644 --- a/modules/commons/commons_wikis/commons_wikis.features.user_permission.inc +++ b/modules/commons/commons_wikis/commons_wikis.features.user_permission.inc @@ -10,7 +10,7 @@ function commons_wikis_user_default_permissions() { $permissions = array(); - // Exported permission: create wiki content. + // Exported permission: 'create wiki content'. $permissions['create wiki content'] = array( 'name' => 'create wiki content', 'roles' => array( @@ -20,7 +20,7 @@ function commons_wikis_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete own wiki content. + // Exported permission: 'delete own wiki content'. $permissions['delete own wiki content'] = array( 'name' => 'delete own wiki content', 'roles' => array( @@ -29,7 +29,7 @@ function commons_wikis_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit any wiki content. + // Exported permission: 'edit any wiki content'. $permissions['edit any wiki content'] = array( 'name' => 'edit any wiki content', 'roles' => array( @@ -39,7 +39,7 @@ function commons_wikis_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit own wiki content. + // Exported permission: 'edit own wiki content'. $permissions['edit own wiki content'] = array( 'name' => 'edit own wiki content', 'roles' => array( diff --git a/modules/commons/commons_wikis/commons_wikis.views_default.inc b/modules/commons/commons_wikis/commons_wikis.views_default.inc index 90f52821497338cf769e58d543273c9bce51a6a3..87e540cbe83116695344d3c73a91b64db3bd4368 100644 --- a/modules/commons/commons_wikis/commons_wikis.views_default.inc +++ b/modules/commons/commons_wikis/commons_wikis.views_default.inc @@ -31,7 +31,7 @@ function commons_wikis_views_default_views() { $handler->display->display_options['pager']['type'] = 'lite'; $handler->display->display_options['pager']['options']['items_per_page'] = '10'; $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['pager']['options']['id'] = '0'; + $handler->display->display_options['pager']['options']['id'] = 5; $handler->display->display_options['pager']['options']['quantity'] = '9'; $handler->display->display_options['style_plugin'] = 'default'; $handler->display->display_options['row_plugin'] = 'entity'; diff --git a/modules/commons/commons_wikis/modules/commons_wikis_pages/commons_wikis_pages.features.inc b/modules/commons/commons_wikis/modules/commons_wikis_pages/commons_wikis_pages.features.inc index e545efb99b404517de2e6206372b462d272ed2f6..42d5e2e6a59b78bd977ce9f0d8204be9b4847c7e 100644 --- a/modules/commons/commons_wikis/modules/commons_wikis_pages/commons_wikis_pages.features.inc +++ b/modules/commons/commons_wikis/modules/commons_wikis_pages/commons_wikis_pages.features.inc @@ -7,12 +7,10 @@ /** * Implements hook_ctools_plugin_api(). */ -function commons_wikis_pages_ctools_plugin_api() { - list($module, $api) = func_get_args(); +function commons_wikis_pages_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "panelizer" && $api == "panelizer") { return array("version" => "1"); } - list($module, $api) = func_get_args(); if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } diff --git a/modules/commons/commons_wikis/modules/commons_wikis_pages/commons_wikis_pages.info b/modules/commons/commons_wikis/modules/commons_wikis_pages/commons_wikis_pages.info index fbeafa306d140a3d20613fca6044044762d21514..cbbecac3b086bd5527a1a42e82f224e97496b413 100644 --- a/modules/commons/commons_wikis/modules/commons_wikis_pages/commons_wikis_pages.info +++ b/modules/commons/commons_wikis/modules/commons_wikis_pages/commons_wikis_pages.info @@ -2,7 +2,6 @@ name = Commons Wikis Home description = Provides the panelizer feature for Wikis. core = 7.x package = Commons - Landing pages -php = 5.2.4 project = commons_wikis_pages dependencies[] = commons_wikis dependencies[] = ctools @@ -10,6 +9,6 @@ dependencies[] = panelizer dependencies[] = strongarm features[ctools][] = panelizer:panelizer:1 features[ctools][] = strongarm:strongarm:1 -features[features_api][] = api:1 +features[features_api][] = api:2 features[panelizer_defaults][] = node:wiki:default features[variable][] = panelizer_defaults_node_wiki diff --git a/modules/commons/commons_wysiwyg/commons_wysiwyg.features.ckeditor_profile.inc b/modules/commons/commons_wysiwyg/commons_wysiwyg.features.ckeditor_profile.inc index ac7e74cac2455b63c655c9e312218352808c1d19..9974e8a5488ec7dc7b0837e5f2245405b5894ae0 100644 --- a/modules/commons/commons_wysiwyg/commons_wysiwyg.features.ckeditor_profile.inc +++ b/modules/commons/commons_wysiwyg/commons_wysiwyg.features.ckeditor_profile.inc @@ -12,7 +12,7 @@ function commons_wysiwyg_ckeditor_profile_defaults() { 'Advanced' => array( 'name' => 'Advanced', 'settings' => array( - 'ss' => '2', + 'ss' => 2, 'default' => 't', 'show_toggle' => 't', 'uicolor' => 'default', diff --git a/modules/commons/commons_wysiwyg/commons_wysiwyg.features.filter.inc b/modules/commons/commons_wysiwyg/commons_wysiwyg.features.filter.inc index 4a1d60590e65bb95ca8fda8ef46a57ded0b37fc0..2ef366107e3216ca5a8c5a6a6850888bfe00984f 100644 --- a/modules/commons/commons_wysiwyg/commons_wysiwyg.features.filter.inc +++ b/modules/commons/commons_wysiwyg/commons_wysiwyg.features.filter.inc @@ -14,13 +14,13 @@ function commons_wysiwyg_filter_default_formats() { $formats['filtered_html'] = array( 'format' => 'filtered_html', 'name' => 'Filtered HTML', - 'cache' => '1', - 'status' => '1', - 'weight' => '0', + 'cache' => 1, + 'status' => 1, + 'weight' => 0, 'filters' => array( 'filter_html' => array( - 'weight' => '1', - 'status' => '1', + 'weight' => 1, + 'status' => 1, 'settings' => array( 'allowed_html' => '


    1. ', 'filter_html_help' => 1, @@ -34,9 +34,9 @@ function commons_wysiwyg_filter_default_formats() { $formats['full_html'] = array( 'format' => 'full_html', 'name' => 'Full HTML', - 'cache' => '1', - 'status' => '1', - 'weight' => '1', + 'cache' => 1, + 'status' => 1, + 'weight' => 1, 'filters' => array(), ); diff --git a/modules/commons/commons_wysiwyg/commons_wysiwyg.features.user_permission.inc b/modules/commons/commons_wysiwyg/commons_wysiwyg.features.user_permission.inc index 0294bf9b00e6ba69def976d6436864fb84aad190..30d909a2d4d1402ee8c1b47407b196551259b7c4 100644 --- a/modules/commons/commons_wysiwyg/commons_wysiwyg.features.user_permission.inc +++ b/modules/commons/commons_wysiwyg/commons_wysiwyg.features.user_permission.inc @@ -10,7 +10,7 @@ function commons_wysiwyg_user_default_permissions() { $permissions = array(); - // Exported permission: use text format filtered_html. + // Exported permission: 'use text format filtered_html'. $permissions['use text format filtered_html'] = array( 'name' => 'use text format filtered_html', 'roles' => array( diff --git a/modules/commons/commons_wysiwyg/commons_wysiwyg.info b/modules/commons/commons_wysiwyg/commons_wysiwyg.info index 2accb9600ab8c119ad89c3cf8d3babb31ad2f5ce..75018f6681e3cc73479260061bdd913f326795a7 100644 --- a/modules/commons/commons_wysiwyg/commons_wysiwyg.info +++ b/modules/commons/commons_wysiwyg/commons_wysiwyg.info @@ -2,7 +2,6 @@ name = Commons WYSIWYG description = Provides a rich text editor for content creation. core = 7.x package = Commons - Building blocks -php = 5.2.4 project = commons_wysiwyg dependencies[] = ckeditor dependencies[] = features @@ -10,7 +9,7 @@ dependencies[] = filter dependencies[] = strongarm datestamp = 1358798210 features[ckeditor_profile][] = Advanced -features[features_api][] = api:1 +features[features_api][] = api:2 features[filter][] = filtered_html features[filter][] = full_html -features[user_permission][] = use text format filtered_html \ No newline at end of file +features[user_permission][] = use text format filtered_html