![]()
';
+
+ $formats['filtered_html']['filters'] += array(
+ 'entity_embed' => array(
+ 'weight' => 2,
+ 'status' => 1,
+ 'settings' => array(),
+ ),
+ 'filter_align' => array(
+ 'weight' => 3,
+ 'status' => 1,
+ 'settings' => array(),
+ ),
+ );
+ }
+
+ // Enable legacy Media: WYSIWYG filter.
+ if (module_exists('media_wysiwyg')) {
+ // Enable the media filter.
+ $formats['filtered_html']['filters'] += array(
+ 'media_filter' => array(
+ 'status' => 1,
+ 'weight' => 4,
+ ),
+ );
+ }
}
}
@@ -158,7 +219,7 @@ function commons_media_filter_default_formats_alter(&$formats) {
* Implements hook_ckeditor_profile_defaults().
*/
function commons_media_ckeditor_profile_defaults_alter(&$profiles) {
- if (module_exists('media_wysiwyg') && !empty($profiles['Advanced'])) {
+ if (module_exists('entity_embed') && !empty($profiles['Advanced'])) {
// Disable the advanced content filter.
$profiles['Advanced']['settings']['allowed_content'] = 'f';
@@ -167,16 +228,26 @@ function commons_media_ckeditor_profile_defaults_alter(&$profiles) {
[\'Format\'],
[\'Bold\',\'Italic\',\'Strike\'],
[\'NumberedList\',\'BulletedList\',\'Indent\',\'Outdent\',\'Blockquote\'],
- [\'Link\',\'Unlink\',\'Media\']
+ [\'Link\',\'Unlink\',\'file\']
]';
- // Load the media plugin.
+ // Load the Entity Embed plugin.
$profiles['Advanced']['settings']['loadPlugins'] += array(
- 'media' => array(
+ 'drupalentity' => array(
+ 'name' => 'drupalentity',
+ 'desc' => 'Plugin for embedding entities',
+ 'path' => '/profiles/commons/modules/contrib/entity_embed/js/plugins/drupalentity/',
'default' => 'f',
- 'desc' => 'Plugin for inserting images from Drupal media module',
- 'name' => 'media',
- 'path' => '%plugin_dir%media/',
+ 'buttons' => array(
+ 'file' => array(
+ 'label' => 'File',
+ 'icon' => 'entity.png',
+ ),
+ 'node' => array(
+ 'label' => 'Content',
+ 'icon' => 'entity.png',
+ ),
+ ),
),
);
}
@@ -238,7 +309,7 @@ function commons_media_entity_presave($entity, $type) {
// private group content.
foreach ($items as $delta => $item) {
// Move files to the private file system if the content is private.
- if ($entity->group_content_access[LANGUAGE_NONE][0]['value'] == 2) {
+ if (isset($entity->group_content_access[LANGUAGE_NONE][0]['value']) && $entity->group_content_access[LANGUAGE_NONE][0]['value'] == 2) {
$source_file = file_load($item['fid']);
// Only move public files.
@@ -291,3 +362,13 @@ function _commons_media_get_file_and_image_fields($entity, $type) {
return $collected_fields;
}
+
+/**
+ * Implements hook_entity_embed_alter().
+ */
+function commons_media_entity_embed_alter(&$build, $entity, $context) {
+ // Remove the contextual links on all entites that provide them.
+ if (isset($build['#contextual_links'])) {
+ unset($build['#contextual_links']);
+ }
+}
diff --git a/modules/commons/commons_misc/commons_misc.info b/modules/commons/commons_misc/commons_misc.info
index e310445..26e9eb4 100644
--- a/modules/commons/commons_misc/commons_misc.info
+++ b/modules/commons/commons_misc/commons_misc.info
@@ -1,13 +1,15 @@
name = Commons Miscellaneous Configuration
-description = Various suggested bits of configuration for Commons sites.
-core = 7.x
+description = Includes various suggested bits of configuration for Commons sites.
package = Commons - Building blocks
+core = 7.x
+
dependencies[] = comment
dependencies[] = ctools
dependencies[] = features
dependencies[] = node
dependencies[] = strongarm
dependencies[] = user
+
features[ctools][] = page_manager:pages_default:1
features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2
@@ -20,14 +22,14 @@ features[user_permission][] = skip comment approval
features[user_permission][] = view own unpublished content
features[user_role][] = administrator
features[variable][] = navbar_libraries_variants
-features[variable][] = theme_adaptivetheme_settings
features[variable][] = theme_commons_origins_settings
features[variable][] = user_register
+
features_exclude[dependencies][page_manager] = page_manager
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_misc/commons_misc.install b/modules/commons/commons_misc/commons_misc.install
index b8ab941..e6e5051 100644
--- a/modules/commons/commons_misc/commons_misc.install
+++ b/modules/commons/commons_misc/commons_misc.install
@@ -65,3 +65,15 @@ function commons_misc_update_7002() {
features_revert($revert);
return array();
}
+
+/**
+ * Ensure that the theme settings are up-to-date with the latest version of
+ * Adaptive Theme and fix Commons Misc appearing overridden.
+ */
+function commons_misc_update_7003() {
+ $revert = array(
+ 'commons_misc' => array('variable'),
+ );
+ features_revert($revert);
+ return array();
+}
diff --git a/modules/commons/commons_misc/commons_misc.module b/modules/commons/commons_misc/commons_misc.module
index c2df42c..9372efd 100644
--- a/modules/commons/commons_misc/commons_misc.module
+++ b/modules/commons/commons_misc/commons_misc.module
@@ -6,6 +6,18 @@
include_once 'commons_misc.features.inc';
+/**
+ * Implements hook_system_info_alter()
+ */
+function commons_misc_system_info_alter(&$info, $file, $type) {
+ // Remove the OG Example module from the features page as it displays a
+ // conflict with Commons Body, which is detected as a false positive when
+ // using behavioural tests to catch feature conflicts.
+ if ($type == 'module' && $file->name == 'og_example') {
+ unset($info['features']);
+ }
+}
+
/**
* Implements hook_mail_alter();
*/
@@ -45,30 +57,3 @@ function commons_misc_form_system_theme_settings_alter(&$form, &$form_state, $fo
commons_origins_palettes_form($form);
}
}
-
-/**
- * Implements hook_navbar().
- */
-function commons_misc_navbar() {
- $items = array();
-
- // Add a link to the official commons documentation.
- $items['documentation'] = array(
- '#type' => 'navbar_item',
- 'tab' => array(
- '#type' => 'link',
- '#title' => t('Documentation'),
- '#href' => 'https://docs.acquia.com/commons',
- '#options' => array(
- 'attributes' => array(
- 'title' => t('Commons Documentation'),
- 'class' => array('icon', 'icon-help'),
- 'target' => '_blank',
- ),
- ),
- ),
- '#weight' => 20,
- );
-
- return $items;
-}
diff --git a/modules/commons/commons_misc/commons_misc.navbar.inc b/modules/commons/commons_misc/commons_misc.navbar.inc
new file mode 100644
index 0000000..36de2b1
--- /dev/null
+++ b/modules/commons/commons_misc/commons_misc.navbar.inc
@@ -0,0 +1,33 @@
+ 'navbar_item',
+ 'tab' => array(
+ '#type' => 'link',
+ '#title' => t('Documentation'),
+ '#href' => 'https://docs.acquia.com/commons',
+ '#options' => array(
+ 'attributes' => array(
+ 'title' => t('Commons Documentation'),
+ 'class' => array('navbar-icon', 'navbar-icon-help'),
+ 'target' => '_blank',
+ ),
+ ),
+ ),
+ '#weight' => 20,
+ );
+
+ return $items;
+}
diff --git a/modules/commons/commons_misc/commons_misc.strongarm.inc b/modules/commons/commons_misc/commons_misc.strongarm.inc
index 53ef917..214dfab 100644
--- a/modules/commons/commons_misc/commons_misc.strongarm.inc
+++ b/modules/commons/commons_misc/commons_misc.strongarm.inc
@@ -13,149 +13,11 @@ function commons_misc_strongarm() {
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
- $strongarm->name = 'theme_adaptivetheme_settings';
+ $strongarm->name = 'navbar_libraries_variants';
$strongarm->value = array(
- 'toggle_logo' => 1,
- 'toggle_name' => 1,
- 'toggle_slogan' => 1,
- 'toggle_node_user_picture' => 1,
- 'toggle_comment_user_picture' => 1,
- 'toggle_comment_user_verification' => 1,
- 'toggle_favicon' => 1,
- 'toggle_main_menu' => 1,
- 'toggle_secondary_menu' => 1,
- 'default_logo' => 1,
- 'logo_path' => '',
- 'logo_upload' => '',
- 'default_favicon' => 1,
- 'favicon_path' => '',
- 'favicon_upload' => '',
- 'bigscreen_layout' => 'three_col_grail',
- 'bigscreen_sidebar_unit' => '%',
- 'bigscreen_sidebar_first' => '25',
- 'bigscreen_sidebar_second' => '25',
- 'bigscreen_page_unit' => '%',
- 'bigscreen_page_width' => '100',
- 'bigscreen_set_max_width' => '1',
- 'bigscreen_max_width_unit' => 'px',
- 'bigscreen_max_width' => '1140',
- 'bigscreen_media_query' => 'only screen and (min-width:1025px)',
- 'tablet_landscape_layout' => 'three_col_grail',
- 'tablet_landscape_sidebar_unit' => '%',
- 'tablet_landscape_sidebar_first' => '20',
- 'tablet_landscape_sidebar_second' => '20',
- 'tablet_landscape_page_unit' => '%',
- 'tablet_landscape_page_width' => '100',
- 'tablet_landscape_media_query' => 'only screen and (min-width:769px) and (max-width:1024px)',
- 'tablet_portrait_layout' => 'one_col_vert',
- 'tablet_portrait_sidebar_unit' => '%',
- 'tablet_portrait_sidebar_first' => '50',
- 'tablet_portrait_sidebar_second' => '50',
- 'tablet_portrait_page_unit' => '%',
- 'tablet_portrait_page_width' => '100',
- 'tablet_portrait_media_query' => 'only screen and (min-width:481px) and (max-width:768px)',
- 'smartphone_landscape_layout' => 'one_col_vert',
- 'smartphone_landscape_sidebar_unit' => '%',
- 'smartphone_landscape_sidebar_first' => '50',
- 'smartphone_landscape_sidebar_second' => '50',
- 'smartphone_landscape_media_query' => 'only screen and (min-width:321px) and (max-width:480px)',
- 'smartphone_landscape_page_width' => '100',
- 'smartphone_landscape_page_unit' => '%',
- 'smartphone_portrait_media_query' => 'only screen and (max-width:320px)',
- 'smartphone_portrait_page_width' => '',
- 'smartphone_portrait_page_unit' => '',
- 'smartphone_portrait_sidebar_first' => '',
- 'smartphone_portrait_sidebar_second' => '',
- 'smartphone_portrait_sidebar_unit' => '',
- 'smartphone_portrait_layout' => '',
- 'bigscreen_two_brick' => 'two-brick',
- 'bigscreen_two_66_33' => 'two-66-33',
- 'bigscreen_two_50' => 'two-50',
- 'bigscreen_two_33_66' => 'two-33-66',
- 'bigscreen_three_50_25_25' => 'three-50-25-25',
- 'bigscreen_three_3x33' => 'three-3x33',
- 'bigscreen_three_25_50_25' => 'three-25-50-25',
- 'bigscreen_three_25_25_50' => 'three-25-25-50',
- 'bigscreen_four_4x25' => 'four-4x25',
- 'bigscreen_five_5x20' => 'five-5x20-2x3-grid',
- 'bigscreen_six_6x16' => 'six-6x16-3x2-grid',
- 'bigscreen_three_inset_right' => 'three-inset-right',
- 'bigscreen_three_inset_left' => 'three-inset-left',
- 'tablet_landscape_two_brick' => 'two-brick',
- 'tablet_landscape_two_66_33' => 'two-66-33',
- 'tablet_landscape_two_50' => 'two-50',
- 'tablet_landscape_two_33_66' => 'two-33-66',
- 'tablet_landscape_three_50_25_25' => 'three-50-25-25',
- 'tablet_landscape_three_3x33' => 'three-3x33',
- 'tablet_landscape_three_25_50_25' => 'three-25-50-25',
- 'tablet_landscape_three_25_25_50' => 'three-25-25-50',
- 'tablet_landscape_four_4x25' => 'four-4x25',
- 'tablet_landscape_five_5x20' => 'five-5x20-2x3-grid',
- 'tablet_landscape_six_6x16' => 'six-6x16-3x2-grid',
- 'tablet_landscape_three_inset_right' => 'three-inset-right',
- 'tablet_landscape_three_inset_left' => 'three-inset-left',
- 'tablet_portrait_two_brick' => 'two-brick',
- 'tablet_portrait_two_66_33' => 'two-66-33',
- 'tablet_portrait_two_50' => 'two-50',
- 'tablet_portrait_two_33_66' => 'two-33-66',
- 'tablet_portrait_three_50_25_25' => 'three-50-25-25-stack-top',
- 'tablet_portrait_three_3x33' => 'three-3x33-stack-top',
- 'tablet_portrait_three_25_50_25' => 'three-25-50-25-stack-top',
- 'tablet_portrait_three_25_25_50' => 'three-25-25-50-stack-top',
- 'tablet_portrait_four_4x25' => 'four-4x25-2x2-grid',
- 'tablet_portrait_five_5x20' => 'five-5x20-1x2x2-grid',
- 'tablet_portrait_six_6x16' => 'six-6x16-2x3-grid',
- 'tablet_portrait_three_inset_right' => 'three-inset-right-wrap',
- 'tablet_portrait_three_inset_left' => 'three-inset-left-wrap',
- 'smartphone_landscape_two_brick' => 'two-brick-stack',
- 'smartphone_landscape_two_66_33' => 'two-66-33-stack',
- 'smartphone_landscape_two_50' => 'two-50-stack',
- 'smartphone_landscape_two_33_66' => 'two-33-66-stack',
- 'smartphone_landscape_three_50_25_25' => 'three-50-25-25-stack',
- 'smartphone_landscape_three_3x33' => 'three-3x33-stack',
- 'smartphone_landscape_three_25_50_25' => 'three-25-50-25-stack',
- 'smartphone_landscape_three_25_25_50' => 'three-25-25-50-stack',
- 'smartphone_landscape_four_4x25' => 'four-4x25-stack',
- 'smartphone_landscape_five_5x20' => 'five-5x20-stack',
- 'smartphone_landscape_six_6x16' => 'six-6x16-stack',
- 'smartphone_landscape_three_inset_right' => 'three-inset-right-stack',
- 'smartphone_landscape_three_inset_left' => 'three-inset-left-stack',
- 'enable_custom_media_queries' => '1',
- 'global_default_layout_toggle' => '0',
- 'global_default_layout' => 'smartphone-portrait',
- 'global_files_path' => 'public_files',
- 'custom_files_path' => '',
- 'disable_responsive_styles' => '0',
- 'load_html5js' => '1',
- 'load_onmediaqueryjs' => '0',
- 'load_ltie8css' => '0',
- 'load_respondjs' => '0',
- 'load_scalefixjs' => '0',
- 'adaptivetheme_meta_viewport' => 'width=device-width, initial-scale=1',
- 'adaptivetheme_meta_mobileoptimized' => 'width',
- 'adaptivetheme_meta_handheldfriendly' => 'true',
- 'adaptivetheme_meta_apple_mobile_web_app_capable' => 'yes',
- 'chrome_edge' => '0',
- 'clear_type' => '0',
- 'expose_regions' => '0',
- 'show_window_size' => '0',
- 'atcore_version_test' => 0,
- 'load_all_panels' => '0',
- 'load_all_panels_no_sidebars' => '0',
- 'enable_extensions' => '0',
- 'enable_font_settings' => '0',
- 'enable_heading_settings' => '0',
- 'enable_image_settings' => '0',
- 'enable_apple_touch_icons' => '0',
- 'enable_exclude_css' => '0',
- 'enable_custom_css' => '0',
- 'enable_context_regions' => '0',
- 'enable_float_region_blocks' => '0',
- 'enable_markup_overides' => '0',
- 'at-settings__active_tab' => '',
- 'at_core' => '7.x-3.x',
+ 'modernizr' => 'source',
);
- $export['theme_adaptivetheme_settings'] = $strongarm;
+ $export['navbar_libraries_variants'] = $strongarm;
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
@@ -304,15 +166,6 @@ function commons_misc_strongarm() {
);
$export['theme_commons_origins_settings'] = $strongarm;
- $strongarm = new stdClass();
- $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
- $strongarm->api_version = 1;
- $strongarm->name = 'navbar_libraries_variants';
- $strongarm->value = array(
- 'modernizr' => 'source',
- );
- $export['navbar_libraries_variants'] = $strongarm;
-
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
diff --git a/modules/commons/commons_notices/commons_notices.features.field_instance.inc b/modules/commons/commons_notices/commons_notices.features.field_instance.inc
index 99a6cc3..55845ef 100644
--- a/modules/commons/commons_notices/commons_notices.features.field_instance.inc
+++ b/modules/commons/commons_notices/commons_notices.features.field_instance.inc
@@ -22,7 +22,7 @@ function commons_notices_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
- 'weight' => 0,
+ 'weight' => -49,
),
'teaser' => array(
'label' => 'hidden',
@@ -31,7 +31,7 @@ function commons_notices_field_default_field_instances() {
'trim_length' => 600,
),
'type' => 'text_summary_or_trimmed',
- 'weight' => 0,
+ 'weight' => -49,
),
),
'entity_type' => 'node',
@@ -50,7 +50,7 @@ function commons_notices_field_default_field_instances() {
'summary_rows' => 5,
),
'type' => 'text_textarea_with_summary',
- 'weight' => -4,
+ 'weight' => -49,
),
);
diff --git a/modules/commons/commons_notices/commons_notices.info b/modules/commons/commons_notices/commons_notices.info
index db5d960..0ab0a3c 100644
--- a/modules/commons/commons_notices/commons_notices.info
+++ b/modules/commons/commons_notices/commons_notices.info
@@ -1,7 +1,8 @@
name = Commons Notices
-core = 7.x
+description = Provides a Notice content type for displaying administrative alerts to users, such as planned system maintenance.
package = Commons - Content types
-php = 5.2.4
+core = 7.x
+
dependencies[] = commons_body
dependencies[] = ctools
dependencies[] = features
@@ -9,9 +10,10 @@ dependencies[] = node
dependencies[] = strongarm
dependencies[] = text
dependencies[] = views
+
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-notice-body
features[node][] = notice
features[variable][] = comment_anonymous_notice
@@ -28,9 +30,9 @@ features[variable][] = node_preview_notice
features[variable][] = node_submitted_notice
features[views_view][] = commons_notices_latest_notices
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_notify/commons_notify.features.field_base.inc b/modules/commons/commons_notify/commons_notify.features.field_base.inc
index 0e8596e..4487c34 100644
--- a/modules/commons/commons_notify/commons_notify.features.field_base.inc
+++ b/modules/commons/commons_notify/commons_notify.features.field_base.inc
@@ -17,14 +17,6 @@ function commons_notify_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_message_rendered_body',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -44,14 +36,6 @@ function commons_notify_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_message_rendered_subject',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -75,7 +59,6 @@ function commons_notify_field_default_field_bases() {
0 => 'user',
),
'field_name' => 'message_subscribe_email',
- 'foreign keys' => array(),
'indexes' => array(
'value' => array(
0 => 'value',
diff --git a/modules/commons/commons_notify/commons_notify.info b/modules/commons/commons_notify/commons_notify.info
index 7386906..1ce8004 100644
--- a/modules/commons/commons_notify/commons_notify.info
+++ b/modules/commons/commons_notify/commons_notify.info
@@ -1,6 +1,8 @@
name = Commons Notify
-core = 7.x
+description = Provides a framework for allowing users to be notified when an event is triggered.
package = Commons - Building blocks
+core = 7.x
+
dependencies[] = commons_follow
dependencies[] = ctools
dependencies[] = entity
@@ -14,6 +16,7 @@ dependencies[] = number
dependencies[] = options
dependencies[] = strongarm
dependencies[] = text
+
features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2
features[field_base][] = field_message_rendered_body
@@ -45,13 +48,14 @@ features[variable][] = field_bundle_settings_message__commons_notify_comment_cre
features[variable][] = field_bundle_settings_message__commons_notify_node_created
features[variable][] = field_bundle_settings_message__commons_notify_node_created_no_groups
features[variable][] = message_subscribe_default_notifiers
+
features_exclude[field_base][message_text] = message_text
features_exclude[field_base][field_target_nodes] = field_target_nodes
features_exclude[field_base][field_target_comments] = field_target_comments
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_notify/commons_notify.module b/modules/commons/commons_notify/commons_notify.module
index 2cfcc7d..bd8b3ca 100644
--- a/modules/commons/commons_notify/commons_notify.module
+++ b/modules/commons/commons_notify/commons_notify.module
@@ -20,8 +20,10 @@ function commons_notify_node_insert($node) {
/**
* Send a notification for newly created nodes.
+ *
* This function is registered as a shutdown function
* in commons_notify_node_insert.
+ *
* Note that shutdown functions run after drupal_set_message() messages are
* displayed, so you'll need to use another method such as watchdog() logging
* if you wish to add debugging messages to this function.
@@ -45,7 +47,7 @@ function commons_notify_send_message_on_shutdown($node) {
if (!isset($node->og_group_ref[LANGUAGE_NONE][0]['target_id'])) {
$message_type = 'commons_notify_node_created_no_groups';
}
- // Allow other modules to specify an alternative messagge type to use.
+ // Allow other modules to specify an alternative message type to use.
$hook = 'node_insert';
drupal_alter('commons_notify_message_selection', $message_type, $hook, $node);
$account = user_load($node->uid);
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 2caa003..998e99f 100644
--- a/modules/commons/commons_pages/commons_pages.features.field_instance.inc
+++ b/modules/commons/commons_pages/commons_pages.features.field_instance.inc
@@ -22,7 +22,7 @@ function commons_pages_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
- 'weight' => 0,
+ 'weight' => -49,
),
'teaser' => array(
'label' => 'hidden',
@@ -31,7 +31,7 @@ function commons_pages_field_default_field_instances() {
'trim_length' => 600,
),
'type' => 'text_summary_or_trimmed',
- 'weight' => 0,
+ 'weight' => -49,
),
),
'entity_type' => 'node',
@@ -50,7 +50,7 @@ function commons_pages_field_default_field_instances() {
'summary_rows' => 5,
),
'type' => 'text_textarea_with_summary',
- 'weight' => -4,
+ 'weight' => -49,
),
);
diff --git a/modules/commons/commons_pages/commons_pages.info b/modules/commons/commons_pages/commons_pages.info
index b34a3a4..f37e02c 100644
--- a/modules/commons/commons_pages/commons_pages.info
+++ b/modules/commons/commons_pages/commons_pages.info
@@ -1,13 +1,15 @@
name = Commons Pages
-core = 7.x
+description = Provides a Page content type for creating static content.
package = Commons - Content types
+core = 7.x
+
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:2
features[field_instance][] = node-page-body
@@ -26,9 +28,9 @@ features[variable][] = node_preview_page
features[variable][] = node_submitted_page
features[variable][] = pathauto_node_page_pattern
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_pages/commons_pages.module b/modules/commons/commons_pages/commons_pages.module
index f3d530b..099bd29 100644
--- a/modules/commons/commons_pages/commons_pages.module
+++ b/modules/commons/commons_pages/commons_pages.module
@@ -10,20 +10,6 @@ include_once 'commons_pages.features.inc';
* Implements hook_strongarm_alter().
*/
function commons_pages_strongarm_alter(&$items) {
- // Expose the Page content type for 'liking' via the Commons_like module
- // by altering the configuration for the Rate.module widget that it provides.
- if (!empty($items['rate_widgets']->value)) {
- foreach($items['rate_widgets']->value as $key => $widget) {
- if ($widget->name == 'commons_like') {
- if (!in_array('document', $items['rate_widgets']->value[$key]->node_types)) {
- $items['rate_widgets']->value[$key]->node_types[] = 'page';
- }
- if (!in_array('document', $items['rate_widgets']->value[$key]->comment_types)) {
- $items['rate_widgets']->value[$key]->comment_types[] = 'page';
- }
- }
- }
- }
// Expose the Page content type for integration with Commons Groups.
if (isset($items['commons_groups_entity_types'])) {
$items['commons_groups_entity_types']->value['node']['page'] = 1;
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 9ba1622..a60e4cc 100644
--- a/modules/commons/commons_polls/commons_polls.features.field_instance.inc
+++ b/modules/commons/commons_polls/commons_polls.features.field_instance.inc
@@ -22,7 +22,7 @@ function commons_polls_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
- 'weight' => 2,
+ 'weight' => -49,
),
'teaser' => array(
'label' => 'hidden',
@@ -31,7 +31,7 @@ function commons_polls_field_default_field_instances() {
'trim_length' => 600,
),
'type' => 'text_summary_or_trimmed',
- 'weight' => 1,
+ 'weight' => -49,
),
),
'display_in_partial_form' => 1,
@@ -52,7 +52,7 @@ function commons_polls_field_default_field_instances() {
'summary_rows' => 5,
),
'type' => 'text_textarea_with_summary',
- 'weight' => 2,
+ 'weight' => -49,
),
);
diff --git a/modules/commons/commons_polls/commons_polls.info b/modules/commons/commons_polls/commons_polls.info
index 781e8d1..bdbf815 100644
--- a/modules/commons/commons_polls/commons_polls.info
+++ b/modules/commons/commons_polls/commons_polls.info
@@ -1,7 +1,8 @@
name = Commons Polls
-description = Commons poll content type
-core = 7.x
+description = Provides a Poll content type for conducting polls.
package = Commons - Content types
+core = 7.x
+
dependencies[] = commons_body
dependencies[] = commons_topics
dependencies[] = ctools
@@ -14,6 +15,7 @@ dependencies[] = radioactivity
dependencies[] = strongarm
dependencies[] = views
dependencies[] = views_litepager
+
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
@@ -45,9 +47,9 @@ features[variable][] = node_preview_poll
features[variable][] = node_submitted_poll
features[views_view][] = commons_bw_polls
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_polls/commons_polls.install b/modules/commons/commons_polls/commons_polls.install
index e85a4f2..0e260b2 100644
--- a/modules/commons/commons_polls/commons_polls.install
+++ b/modules/commons/commons_polls/commons_polls.install
@@ -92,3 +92,14 @@ function commons_polls_update_7006() {
features_revert($revert);
return array();
}
+
+/**
+ * Standardize browsing widget field weights.
+ */
+function commons_polls_update_7007() {
+ $revert = array(
+ 'commons_polls' => array('field_instance'),
+ );
+ features_revert($revert);
+ return array();
+}
diff --git a/modules/commons/commons_polls/commons_polls.module b/modules/commons/commons_polls/commons_polls.module
index b61ff05..0c48a08 100644
--- a/modules/commons/commons_polls/commons_polls.module
+++ b/modules/commons/commons_polls/commons_polls.module
@@ -10,20 +10,6 @@ include_once 'commons_polls.features.inc';
* Implements hook_strongarm_alter().
*/
function commons_polls_strongarm_alter(&$items) {
- // Expose the poll content type for 'liking' via the Commons_like module
- // by altering the configuration for the Rate.module widget that it provides.
- if (!empty($items['rate_widgets']->value)) {
- foreach($items['rate_widgets']->value as $key => $widget) {
- if ($widget->name == 'commons_like') {
- if (!in_array('poll', $items['rate_widgets']->value[$key]->node_types)) {
- $items['rate_widgets']->value[$key]->node_types[] = 'poll';
- }
- if (!in_array('poll', $items['rate_widgets']->value[$key]->comment_types)) {
- $items['rate_widgets']->value[$key]->comment_types[] = 'poll';
- }
- }
- }
- }
// Expose the poll content type for integration with Commons Radioactivity
// and Commons Groups.
foreach (array('commons_radioactivity_entity_types', 'commons_groups_entity_types') as $key) {
@@ -61,7 +47,6 @@ function commons_polls_form_commons_bw_partial_node_form_alter(&$form, &$form_st
$form['body'][$language][0]['#required'] = TRUE;
$form['body'][$language][0]['#placeholder'] = t('Enter a question, e.g. "What is your favorite color?"');
$form['body'][$language][0]['#resizable'] = FALSE;
- $form['body']['#weight'] = -10;
// Prepare the form for collapsing.
$form['body']['#attributes']['class'][] = 'trigger-field';
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 66591ac..9f35ad1 100644
--- a/modules/commons/commons_posts/commons_posts.features.field_instance.inc
+++ b/modules/commons/commons_posts/commons_posts.features.field_instance.inc
@@ -74,7 +74,7 @@ function commons_posts_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
- 'weight' => 2,
+ 'weight' => -49,
),
'teaser' => array(
'label' => 'hidden',
@@ -83,7 +83,7 @@ function commons_posts_field_default_field_instances() {
'trim_length' => 600,
),
'type' => 'text_summary_or_trimmed',
- 'weight' => 1,
+ 'weight' => -49,
),
),
'display_in_partial_form' => 1,
@@ -104,7 +104,7 @@ function commons_posts_field_default_field_instances() {
'summary_rows' => 5,
),
'type' => 'text_textarea_with_summary',
- 'weight' => 2,
+ 'weight' => -49,
),
);
diff --git a/modules/commons/commons_posts/commons_posts.features.inc b/modules/commons/commons_posts/commons_posts.features.inc
index 6a48d85..d1a3f34 100644
--- a/modules/commons/commons_posts/commons_posts.features.inc
+++ b/modules/commons/commons_posts/commons_posts.features.inc
@@ -38,11 +38,7 @@ function commons_posts_default_message_type() {
"language" : "",
"arguments" : null,
"message_text" : { "und" : [
- {
- "value" : "[message:user:picture:35x35]",
- "format" : "filtered_html",
- "safe_value" : "[message:user:picture:35x35]"
- },
+ { "value" : "[message:user:picture:35x35]", "format" : "filtered_html" },
{
"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_field]\\u003C\\/a\\u003E",
"format" : "full_html",
@@ -50,8 +46,7 @@ function commons_posts_default_message_type() {
},
{
"value" : "[commons-groups:in-groups-text]",
- "format" : "filtered_html",
- "safe_value" : "[commons-groups:in-groups-text]"
+ "format" : "filtered_html"
}
]
},
diff --git a/modules/commons/commons_posts/commons_posts.info b/modules/commons/commons_posts/commons_posts.info
index acae463..5c1c345 100644
--- a/modules/commons/commons_posts/commons_posts.info
+++ b/modules/commons/commons_posts/commons_posts.info
@@ -1,14 +1,15 @@
name = Commons Posts
-description = Commons Post content type
-core = 7.x
+description = Provides a Post content type for creating blog, article or general status updates.
package = Commons - Content types
+core = 7.x
+
dependencies[] = commons_body
-dependencies[] = commons_bw
dependencies[] = commons_topics
dependencies[] = ctools
dependencies[] = entity
dependencies[] = entityreference
dependencies[] = features
+dependencies[] = message
dependencies[] = node
dependencies[] = og
dependencies[] = og_ui
@@ -18,6 +19,7 @@ dependencies[] = taxonomy
dependencies[] = text
dependencies[] = views
dependencies[] = views_litepager
+
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
@@ -51,9 +53,11 @@ features[variable][] = node_preview_post
features[variable][] = node_submitted_post
features[views_view][] = commons_bw_posts
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+features_exclude[dependencies][commons_trusted_contacts] = commons_trusted_contacts
+
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_posts/commons_posts.install b/modules/commons/commons_posts/commons_posts.install
index 42f049b..dd56835 100644
--- a/modules/commons/commons_posts/commons_posts.install
+++ b/modules/commons/commons_posts/commons_posts.install
@@ -103,3 +103,25 @@ function commons_posts_update_7007() {
features_revert($revert);
return array();
}
+
+/**
+ * Standardize browsing widget field weights.
+ */
+function commons_posts_update_7008() {
+ $revert = array(
+ 'commons_posts' => array('field_instance'),
+ );
+ features_revert($revert);
+ return array();
+}
+
+/**
+ * Accommodate changes to message definitions.
+ */
+function commons_posts_update_7009() {
+ $revert = array(
+ 'commons_posts' => array('message_type'),
+ );
+ features_revert($revert);
+ return array();
+}
diff --git a/modules/commons/commons_posts/commons_posts.module b/modules/commons/commons_posts/commons_posts.module
index e958bcb..9f063cc 100644
--- a/modules/commons/commons_posts/commons_posts.module
+++ b/modules/commons/commons_posts/commons_posts.module
@@ -60,9 +60,8 @@ function commons_posts_form_commons_bw_partial_node_form_after_build($form) {
return $form;
}
-
/**
- * Implements commons_activity_streams_message_selection_alter().
+ * Implements hook_commons_activity_streams_message_selection_alter().
*/
function commons_posts_commons_activity_streams_message_selection_alter(&$message_type, $hook, $node) {
// Use a "User posted [title]" format activity stream message.
@@ -72,23 +71,9 @@ function commons_posts_commons_activity_streams_message_selection_alter(&$messag
}
/**
-* Implements hook_strongarm_alter().
-*/
+ * Implements hook_strongarm_alter().
+ */
function commons_posts_strongarm_alter(&$items) {
- // Expose the Post content type for 'liking' via the Commons_like module
- // by altering the configuration for the Rate.module widget that it provides.
- if (!empty($items['rate_widgets']->value)) {
- foreach($items['rate_widgets']->value as $key => $widget) {
- if ($widget->name == 'commons_like') {
- if (!in_array('post', $items['rate_widgets']->value[$key]->node_types)) {
- $items['rate_widgets']->value[$key]->node_types[] = 'post';
- }
- if (!in_array('post', $items['rate_widgets']->value[$key]->comment_types)) {
- $items['rate_widgets']->value[$key]->comment_types[] = 'post';
- }
- }
- }
- }
// Expose the post content type for integration with Commons Radioactivity
// and Commons Groups.
foreach (array('commons_radioactivity_entity_types', 'commons_groups_entity_types') as $key) {
diff --git a/modules/commons/commons_profile_base/commons_profile_base.features.field_base.inc b/modules/commons/commons_profile_base/commons_profile_base.features.field_base.inc
index 340ffe8..786fb24 100644
--- a/modules/commons/commons_profile_base/commons_profile_base.features.field_base.inc
+++ b/modules/commons/commons_profile_base/commons_profile_base.features.field_base.inc
@@ -17,14 +17,6 @@ function commons_profile_base_field_default_field_bases() {
'deleted' => '0',
'entity_types' => array(),
'field_name' => 'field_bio',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -44,14 +36,6 @@ function commons_profile_base_field_default_field_bases() {
'deleted' => '0',
'entity_types' => array(),
'field_name' => 'field_name_first',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -73,14 +57,6 @@ function commons_profile_base_field_default_field_bases() {
'deleted' => '0',
'entity_types' => array(),
'field_name' => 'field_name_last',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
diff --git a/modules/commons/commons_profile_base/commons_profile_base.info b/modules/commons/commons_profile_base/commons_profile_base.info
index 7312612..977e276 100644
--- a/modules/commons/commons_profile_base/commons_profile_base.info
+++ b/modules/commons/commons_profile_base/commons_profile_base.info
@@ -1,11 +1,13 @@
name = Commons Profile Base
-description = Provides a base set of profile fields for user profiles.
-core = 7.x
+description = Provides a base set of general profile fields for user profiles.
package = Commons - Building blocks
+core = 7.x
+
dependencies[] = ctools
dependencies[] = features
dependencies[] = strongarm
dependencies[] = text
+
features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2
features[field_base][] = field_bio
@@ -23,9 +25,9 @@ features[variable][] = user_picture_file_size
features[variable][] = user_picture_style
features[variable][] = user_pictures
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_profile_social/commons_profile_social.features.field_base.inc b/modules/commons/commons_profile_social/commons_profile_social.features.field_base.inc
index 953e171..826440a 100644
--- a/modules/commons/commons_profile_social/commons_profile_social.features.field_base.inc
+++ b/modules/commons/commons_profile_social/commons_profile_social.features.field_base.inc
@@ -17,7 +17,6 @@ function commons_profile_social_field_default_field_bases() {
'deleted' => '0',
'entity_types' => array(),
'field_name' => 'field_facebook_url',
- 'foreign keys' => array(),
'indexes' => array(),
'locked' => '0',
'module' => 'link',
@@ -47,7 +46,6 @@ function commons_profile_social_field_default_field_bases() {
'deleted' => '0',
'entity_types' => array(),
'field_name' => 'field_linkedin_url',
- 'foreign keys' => array(),
'indexes' => array(),
'locked' => '0',
'module' => 'link',
@@ -77,7 +75,6 @@ function commons_profile_social_field_default_field_bases() {
'deleted' => '0',
'entity_types' => array(),
'field_name' => 'field_twitter_url',
- 'foreign keys' => array(),
'indexes' => array(),
'locked' => '0',
'module' => 'link',
diff --git a/modules/commons/commons_profile_social/commons_profile_social.features.field_instance.inc b/modules/commons/commons_profile_social/commons_profile_social.features.field_instance.inc
index a43f441..79c76b0 100644
--- a/modules/commons/commons_profile_social/commons_profile_social.features.field_instance.inc
+++ b/modules/commons/commons_profile_social/commons_profile_social.features.field_instance.inc
@@ -35,6 +35,7 @@ function commons_profile_social_field_default_field_instances() {
'label' => 'Facebook URL',
'required' => 0,
'settings' => array(
+ 'absolute_url' => 1,
'attributes' => array(
'class' => 'facebook-url',
'configurable_title' => 0,
@@ -86,6 +87,7 @@ function commons_profile_social_field_default_field_instances() {
'label' => 'LinkedIn URL',
'required' => 0,
'settings' => array(
+ 'absolute_url' => 1,
'attributes' => array(
'class' => 'linkedin-url',
'configurable_title' => 0,
@@ -138,6 +140,7 @@ function commons_profile_social_field_default_field_instances() {
'label' => 'Twitter URL',
'required' => 0,
'settings' => array(
+ 'absolute_url' => 1,
'attributes' => array(
'class' => 'twitter-url',
'configurable_title' => 0,
diff --git a/modules/commons/commons_profile_social/commons_profile_social.info b/modules/commons/commons_profile_social/commons_profile_social.info
index f034d27..91fab1d 100644
--- a/modules/commons/commons_profile_social/commons_profile_social.info
+++ b/modules/commons/commons_profile_social/commons_profile_social.info
@@ -1,20 +1,23 @@
-name = Commons Profile (Social fields)
-description = Provides a set of link fields to the user's profile for the user's Facebook, Linkedin and Twitter accounts.
-core = 7.x
+name = Commons Profile Social
+description = Provides a base set of social profile fields for user profiles.
package = Commons - Building blocks
+core = 7.x
+
dependencies[] = features
dependencies[] = field_sql_storage
dependencies[] = link
-features[features_api][] = api:1
+
+features[features_api][] = api:2
features[field_base][] = field_facebook_url
features[field_base][] = field_linkedin_url
features[field_base][] = field_twitter_url
features[field_instance][] = user-user-field_facebook_url
features[field_instance][] = user-user-field_linkedin_url
features[field_instance][] = user-user-field_twitter_url
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
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 c8e30b8..8c9f39a 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
@@ -17,14 +17,6 @@ function commons_q_a_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_related_question',
- 'foreign keys' => array(
- 'node' => array(
- 'columns' => array(
- 'target_id' => 'nid',
- ),
- 'table' => 'node',
- ),
- ),
'indexes' => array(
'target_id' => array(
0 => 'target_id',
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 adacf7b..d965953 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
@@ -126,7 +126,7 @@ function commons_q_a_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
- 'weight' => 0,
+ 'weight' => -49,
),
'teaser' => array(
'label' => 'hidden',
@@ -135,7 +135,7 @@ function commons_q_a_field_default_field_instances() {
'trim_length' => 600,
),
'type' => 'text_summary_or_trimmed',
- 'weight' => 0,
+ 'weight' => -49,
),
),
'entity_type' => 'node',
@@ -154,7 +154,7 @@ function commons_q_a_field_default_field_instances() {
'summary_rows' => 5,
),
'type' => 'text_textarea_with_summary',
- 'weight' => -4,
+ 'weight' => -49,
),
);
@@ -223,7 +223,7 @@ function commons_q_a_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
- 'weight' => 2,
+ 'weight' => -49,
),
'teaser' => array(
'label' => 'hidden',
@@ -232,7 +232,7 @@ function commons_q_a_field_default_field_instances() {
'trim_length' => 600,
),
'type' => 'text_summary_or_trimmed',
- 'weight' => 1,
+ 'weight' => -49,
),
),
'display_in_partial_form' => 1,
@@ -253,7 +253,7 @@ function commons_q_a_field_default_field_instances() {
'summary_rows' => 5,
),
'type' => 'text_textarea_with_summary',
- 'weight' => 1,
+ 'weight' => -49,
),
);
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 0e4de9f..2b9b415 100644
--- a/modules/commons/commons_q_a/commons_q_a.features.inc
+++ b/modules/commons/commons_q_a/commons_q_a.features.inc
@@ -41,11 +41,7 @@ function commons_q_a_default_message_type() {
"language" : "",
"arguments" : null,
"message_text" : { "und" : [
- {
- "value" : "[message:user:picture:35x35]",
- "format" : "filtered_html",
- "safe_value" : "[message:user:picture:35x35]"
- },
+ { "value" : "[message:user:picture:35x35]", "format" : "filtered_html" },
{
"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_field]\\u003C\\/a\\u003E\\u0022",
"format" : "full_html",
@@ -73,11 +69,7 @@ function commons_q_a_default_message_type() {
"language" : "",
"arguments" : null,
"message_text" : { "und" : [
- {
- "value" : "[message:user:picture:35x35]",
- "format" : "filtered_html",
- "safe_value" : "[message:user:picture:35x35]"
- },
+ { "value" : "[message:user:picture:35x35]", "format" : "filtered_html" },
{
"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_field]\\u003C\\/a\\u003E",
"format" : "full_html",
diff --git a/modules/commons/commons_q_a/commons_q_a.info b/modules/commons/commons_q_a/commons_q_a.info
index 666b714..2e344f4 100644
--- a/modules/commons/commons_q_a/commons_q_a.info
+++ b/modules/commons/commons_q_a/commons_q_a.info
@@ -1,13 +1,15 @@
-name = Commons Q&A
-description = Allows community members to ask questions and vote for the best answers
-core = 7.x
+name = Commons Questions & Answers
+description = Provides a Q&A content type for asking questions and allowing the community to vote for the best answers.
package = Commons - Content types
+core = 7.x
+
dependencies[] = commons_topics
dependencies[] = ctools
dependencies[] = entity
dependencies[] = entityreference
dependencies[] = features
dependencies[] = field_sql_storage
+dependencies[] = og
dependencies[] = og_ui
dependencies[] = options
dependencies[] = strongarm
@@ -15,6 +17,7 @@ dependencies[] = text
dependencies[] = views
dependencies[] = views_content
dependencies[] = views_litepager
+
features[ctools][] = panelizer:panelizer:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
@@ -80,8 +83,9 @@ features[variable][] = node_submitted_question
features[variable][] = pathauto_node_answer_pattern
features[views_view][] = commons_bw_q_a
features[views_view][] = commons_question_answers
-features_exclude[dependencies][message] = message
+
features_exclude[dependencies][commons_trusted_contacts] = commons_trusted_contacts
+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
@@ -95,9 +99,9 @@ features_exclude[field_instance][og_group_ref] = og_group_ref
features_exclude[field_instance][node-answer-og_group_ref] = node-answer-og_group_ref
features_exclude[field_instance][node-question-og_group_ref] = node-question-og_group_ref
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_q_a/commons_q_a.install b/modules/commons/commons_q_a/commons_q_a.install
index a8abc6a..fbde6c8 100644
--- a/modules/commons/commons_q_a/commons_q_a.install
+++ b/modules/commons/commons_q_a/commons_q_a.install
@@ -174,3 +174,36 @@ function commons_q_a_update_3113() {
features_revert($revert);
return array();
}
+
+/**
+ * Fix URL aliases for group references
+ */
+function commons_q_a_update_3114() {
+ $revert = array(
+ 'commons_q_a' => array('variable'),
+ );
+ features_revert($revert);
+ return array();
+}
+
+/**
+ * Standardize browsing widget field weights.
+ */
+function commons_q_a_update_3115() {
+ $revert = array(
+ 'commons_q_a' => array('field_instance'),
+ );
+ features_revert($revert);
+ return array();
+}
+
+/**
+ * Accommodate changes to message definitions.
+ */
+function commons_q_a_update_3116() {
+ $revert = array(
+ 'commons_q_a' => array('message_type'),
+ );
+ features_revert($revert);
+ return array();
+}
diff --git a/modules/commons/commons_q_a/commons_q_a.module b/modules/commons/commons_q_a/commons_q_a.module
index b51f9aa..6725a5c 100644
--- a/modules/commons/commons_q_a/commons_q_a.module
+++ b/modules/commons/commons_q_a/commons_q_a.module
@@ -262,7 +262,7 @@ function commons_q_a_answer_submit($form, &$form_state) {
}
/**
- * Implements commons_activity_streams_message_selection_alter().
+ * Implements hook_commons_activity_streams_message_selection_alter().
*/
function commons_q_a_commons_activity_streams_message_selection_alter(&$message_type, $hook, $node) {
// Provide a special message type that uses "User asked the question"
@@ -351,15 +351,15 @@ function commons_q_a_rate_templates() {
/**
* Implements hook_strongarm_alter().
*/
- function commons_q_a_strongarm_alter(&$items) {
- // Add Rate module widget configuration used for thumbs up/down
- // rating of answers.
+function commons_q_a_strongarm_alter(&$items) {
+ // The Rate module stores all of its configuration data in a single variable.
+ // Add a thumbs up/down-style 'Answer' rate widget by altering the rate
+ // variable.
if (!empty($items['rate_widgets']->value)) {
$items['rate_widgets']->value[] = commons_q_a_rate_widget();
}
}
-
/**
* Return a Rate module widget configuration used for thumbs up/down
* rating of answers.
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 5223cc6..de79f87 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
@@ -1,10 +1,12 @@
-name = Commons Q&A Pages
-description = Page layout settings for individual Question and Answe pages
+name = Commons Questions & Answers Pages
+description = Enhances the appearance of question nodes by proving the ability for users to post answers inline and allows them to be customized.
core = 7.x
package = Commons - Landing pages
+
dependencies[] = ctools
dependencies[] = panelizer
dependencies[] = strongarm
+
features[ctools][] = panelizer:panelizer:1
features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2
@@ -12,9 +14,9 @@ features[panelizer_defaults][] = node:question:default
features[variable][] = panelizer_defaults_node_answer
features[variable][] = panelizer_defaults_node_question
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
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 cc53940..3de0d03 100644
--- a/modules/commons/commons_radioactivity/commons_radioactivity.features.field_base.inc
+++ b/modules/commons/commons_radioactivity/commons_radioactivity.features.field_base.inc
@@ -17,7 +17,6 @@ function commons_radioactivity_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_radioactivity',
- 'foreign keys' => array(),
'indexes' => array(
'energy' => array(
0 => 'radioactivity_energy',
diff --git a/modules/commons/commons_radioactivity/commons_radioactivity.info b/modules/commons/commons_radioactivity/commons_radioactivity.info
index 60ad748..7551ff7 100644
--- a/modules/commons/commons_radioactivity/commons_radioactivity.info
+++ b/modules/commons/commons_radioactivity/commons_radioactivity.info
@@ -1,13 +1,15 @@
name = Commons Radioactivity
-description = Helps to identify interesting content by automatically determining a decaying radioactivity value for individual pieces of conte
-core = 7.x
+description = Integrates with the Radioactivity module to identify active content.
package = Commons - Building blocks
+core = 7.x
+
dependencies[] = ctools
dependencies[] = features
dependencies[] = field_sql_storage
dependencies[] = radioactivity
dependencies[] = strongarm
dependencies[] = views
+
features[ctools][] = radioactivity:radioactivity_decay_profile:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
@@ -17,9 +19,9 @@ features[radioactivity_decay_profile][] = commons_ra_node
features[variable][] = commons_radioactivity_entity_types
features[views_view][] = commons_radioactivity_admin
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_radioactivity/commons_radioactivity.module b/modules/commons/commons_radioactivity/commons_radioactivity.module
index 4d1f147..d2284c3 100644
--- a/modules/commons/commons_radioactivity/commons_radioactivity.module
+++ b/modules/commons/commons_radioactivity/commons_radioactivity.module
@@ -96,7 +96,7 @@ function commons_radioactivity_get_radioactive_entity_types() {
*/
function commons_radioactivity_incident_node($node, $value) {
// Only operate on nodes that have the radioactivity field.
- if (isset($node->field_radioactivity)) {
+ if (!empty($node->field_radioactivity)) {
// Find the node's ID and bundle.
list($id, , $bundle) = entity_extract_ids('node', $node);
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 bbb5836..7a77172 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
@@ -1,19 +1,21 @@
name = Commons Radioactivity Groups
-description = Views integration for Group radioactivity
+description = Provides Groups integration to the Commons Radioactivity module.
+package = Commons - Building blocks
core = 7.x
-package = Commons - Building Blocks
+
dependencies[] = commons_radioactivity
dependencies[] = og
dependencies[] = views_content
dependencies[] = views_field_view
+
features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
features[views_view][] = commons_radioactivity_groups_active_in_group
features[views_view][] = commons_radioactivity_groups_most_active
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.module b/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.module
index 2ac08f0..ce44d00 100644
--- a/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.module
+++ b/modules/commons/commons_radioactivity/commons_radioactivity_groups/commons_radioactivity_groups.module
@@ -10,6 +10,12 @@ include_once 'commons_radioactivity_groups.features.inc';
* Implements hook_node_insert().
*/
function commons_radioactivity_groups_node_insert($node) {
+ // If the node does not have radioactivity integration then there's nothing to
+ // do here.
+ if (!isset($node->field_radioactivity)) {
+ return;
+ }
+
// If there are no groups associated with this node then there's nothing to do
// here.
if (!isset($node->og_group_ref)) {
@@ -24,6 +30,12 @@ function commons_radioactivity_groups_node_insert($node) {
* Implements hook_node_delete().
*/
function commons_radioactivity_groups_node_delete($node) {
+ // If the node does not have radioactivity integration then there's nothing to
+ // do here.
+ if (!isset($node->field_radioactivity)) {
+ return;
+ }
+
// If there are no groups associated with this node then there's nothing to do
// here.
if (!isset($node->og_group_ref)) {
@@ -38,6 +50,12 @@ function commons_radioactivity_groups_node_delete($node) {
* Implements hook_node_update().
*/
function commons_radioactivity_groups_node_update($node) {
+ // If the node does not have radioactivity integration then there's nothing to
+ // do here.
+ if (!isset($node->field_radioactivity)) {
+ return;
+ }
+
// If there are no groups associated with this node then there's nothing to do
// here.
if (!isset($node->og_group_ref)) {
@@ -62,15 +80,19 @@ function commons_radioactivity_groups_node_update($node) {
function commons_radioactivity_groups_incident_groups($node, $value) {
$gids = array();
- foreach ($node->og_group_ref[LANGUAGE_NONE] as $field) {
- $gids[] = $field['target_id'];
+ if ($items = field_get_items('node', $node, 'og_group_ref')) {
+ foreach ($items as $item) {
+ $gids[] = $item['target_id'];
+ }
}
- // @Todo: We may wish to instead simply select the types of these groups.
- $groups = node_load_multiple($gids);
+ if (count($gids)) {
+ // @Todo: We may wish to instead simply select the types of these groups.
+ $groups = node_load_multiple($gids);
- foreach ($groups as $group) {
- commons_radioactivity_incident_node($group, $value);
+ foreach ($groups as $group) {
+ commons_radioactivity_incident_node($group, $value);
+ }
}
}
@@ -183,47 +205,3 @@ function commons_radioactivity_groups_default_page_manager_pages_alter(&$pages)
$display->panels['three_33_second'][0] = 'new-b6e290b7-1d2b-5db4-a181-28befdcde628';
}
}
-
-/**
- * Implements hook_panelizer_defaults_alter().
- */
-function commons_radioactivity_groups_panelizer_defaults_alter(&$panelizers) {
- // Add the 'active in group' block to each group node.
- $group_bundles = og_get_all_group_bundle();
-
- if (!empty($group_bundles['node'])) {
- foreach ($group_bundles['node'] as $bundle => $name) {
- if (isset($panelizers["node:$bundle:default"])) {
- $panelizer = $panelizers["node:$bundle:default"];
- $display = $panelizer->display;
-
- $pane = new stdClass();
- $pane->pid = 'new-ba735f2b-4734-7724-098d-1925c6a4bb47';
- $pane->panel = 'two_66_33_second';
- $pane->type = 'views_panes';
- $pane->subtype = 'commons_radioactivity_groups_active_in_group-panel_pane_1';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'arguments' => array(
- 'gid' => '%node:nid',
- ),
- 'context' => array(
- 0 => 'panelizer',
- ),
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = 'ba735f2b-4734-7724-098d-1925c6a4bb47';
- $display->content['new-ba735f2b-4734-7724-098d-1925c6a4bb47'] = $pane;
- $display->panels['two_66_33_second'][2] = 'new-ba735f2b-4734-7724-098d-1925c6a4bb47';
- }
- }
- }
-}
diff --git a/modules/commons/commons_search/commons_search.features.menu_links.inc b/modules/commons/commons_search/commons_search.features.menu_links.inc
deleted file mode 100644
index 7246f98..0000000
--- a/modules/commons/commons_search/commons_search.features.menu_links.inc
+++ /dev/null
@@ -1,36 +0,0 @@
- 'main-menu',
- 'link_path' => 'search',
- 'router_path' => 'search',
- 'link_title' => 'Search',
- 'options' => array(
- 'attributes' => array(),
- ),
- 'module' => 'menu',
- 'hidden' => 0,
- 'external' => 0,
- 'has_children' => 0,
- 'expanded' => 0,
- 'weight' => 3,
- 'customized' => 1,
- );
- // Translatables
- // Included for use with string extractors like potx.
- t('Search');
-
-
- return $menu_links;
-}
diff --git a/modules/commons/commons_search/commons_search.info b/modules/commons/commons_search/commons_search.info
index 28737ff..28b8702 100644
--- a/modules/commons/commons_search/commons_search.info
+++ b/modules/commons/commons_search/commons_search.info
@@ -1,7 +1,8 @@
name = Commons Search
-description = Provide the global search block.
-core = 7.x
+description = Provides a framework for searching site content.
package = Commons - Search
+core = 7.x
+
dependencies[] = ctools
dependencies[] = custom_search
dependencies[] = features
@@ -9,12 +10,11 @@ dependencies[] = search
dependencies[] = strongarm
dependencies[] = views
dependencies[] = views_load_more
-stylesheets[all][] = css/commons_search.css
+
features[ctools][] = panelizer:panelizer:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
-features[features_api][] = api:1
-features[menu_links][] = main-menu:search
+features[features_api][] = api:2
features[user_permission][] = search content
features[user_permission][] = use advanced search
features[user_permission][] = use custom search
@@ -61,9 +61,10 @@ features[variable][] = custom_search_type_selector_all
features[variable][] = custom_search_type_selector_label
features[variable][] = custom_search_type_selector_label_visibility
features[views_view][] = group_search
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_search/commons_search.module b/modules/commons/commons_search/commons_search.module
index a4742bb..885da60 100644
--- a/modules/commons/commons_search/commons_search.module
+++ b/modules/commons/commons_search/commons_search.module
@@ -18,6 +18,18 @@ function commons_search_module_implements_alter(&$implementations, $hook) {
}
}
+/**
+ * Implements hook_menu_alter().
+ */
+function commons_search_menu_alter(&$items) {
+ // Enable the search link and position it in the main menu.
+ if (isset($items['search'])) {
+ $items['search']['type'] = MENU_NORMAL_ITEM;
+ $items['search']['menu_name'] = 'main-menu';
+ $items['search']['weight'] = 3;
+ }
+}
+
/**
* Custom search form that switches between Core and Solr depending on which is
* the enabled search module.
diff --git a/modules/commons/commons_search/css/commons_search.css b/modules/commons/commons_search/css/commons_search.css
deleted file mode 100644
index 6885430..0000000
--- a/modules/commons/commons_search/css/commons_search.css
+++ /dev/null
@@ -1,3 +0,0 @@
-div.view-group-search div.view-filters {
- /*display: none;*/
-}
\ No newline at end of file
diff --git a/modules/commons/commons_search/modules/commons_search_core/commons_search_core.info b/modules/commons/commons_search/modules/commons_search_core/commons_search_core.info
index ac5fb83..097a7a3 100644
--- a/modules/commons/commons_search/modules/commons_search_core/commons_search_core.info
+++ b/modules/commons/commons_search/modules/commons_search_core/commons_search_core.info
@@ -1,13 +1,15 @@
name = Commons Search Core
-description = Core search with facets.
-core = 7.x
+description = Provides integration between the core Search module and Commons Search.
package = Commons - Search
+core = 7.x
+
dependencies[] = commons_search
dependencies[] = date_facets
dependencies[] = facetapi
dependencies[] = page_manager
dependencies[] = search_facetapi
dependencies[] = strongarm
+
features[ctools][] = facetapi:facetapi_defaults:1
features[ctools][] = page_manager:pages_default:1
features[ctools][] = strongarm:strongarm:1
@@ -21,18 +23,16 @@ features[facetapi][] = search:block:bundle
features[facetapi][] = search:block:changed
features[facetapi][] = search:block:created
features[facetapi][] = search:block:field_topics
-features[features_api][] = api:1
+features[features_api][] = api:2
features[page_manager_handlers][] = search_search_facetapi_panel_context
features[page_manager_handlers][] = search_search_facetapi_panel_context_2
features[variable][] = page_manager_search_disabled_search_facetapi
-features[variable][] = custom_search_other
-features[variable][] = search_active_modules
-features[variable][] = search_default_module
+
features_exclude[dependencies][ctools] = ctools
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_search/modules/commons_search_core/commons_search_core.strongarm.inc b/modules/commons/commons_search/modules/commons_search_core/commons_search_core.strongarm.inc
index ff9348c..e326b04 100644
--- a/modules/commons/commons_search/modules/commons_search_core/commons_search_core.strongarm.inc
+++ b/modules/commons/commons_search/modules/commons_search_core/commons_search_core.strongarm.inc
@@ -17,32 +17,31 @@ function commons_search_core_strongarm() {
$strongarm->value = FALSE;
$export['page_manager_search_disabled_search_facetapi'] = $strongarm;
- $strongarm = new stdClass();
- $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
- $strongarm->api_version = 1;
- $strongarm->name = 'search_active_modules';
- $strongarm->value = array(
- 'search_facetapi' => 'search_facetapi',
- 'user' => 'user',
- 'node' => 0,
- );
- $export['search_active_modules'] = $strongarm;
- $strongarm = new stdClass();
- $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
- $strongarm->api_version = 1;
- $strongarm->name = 'search_default_module';
- $strongarm->value = 'search_facetapi';
- $export['search_default_module'] = $strongarm;
-
- $strongarm = new stdClass();
- $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
- $strongarm->api_version = 1;
- $strongarm->name = 'custom_search_other';
- $strongarm->value = array(
- 'search_facetapi' => 'search_facetapi',
- 'user' => 'user',
- );
- $export['custom_search_other'] = $strongarm;
-
return $export;
}
+
+/**
+ * Implements hook_strongarm_alter().
+ */
+function commons_search_core_strongarm_alter(&$items) {
+ // Enable the Facet API and User search modules and disable the node module.
+ if (isset($items['search_active_modules'])) {
+ $items['search_active_modules']->value['search_facetapi'] = 'search_facetapi';
+ $items['search_active_modules']->value['user'] = 'user';
+ $items['search_active_modules']->value['node']['group'] = 0;
+ }
+
+ // Set Facet API as the default search module.
+ // Apache SOLR should take precedence if it is available.
+ if (!module_exists('commons_search_solr')) {
+ if (isset($items['search_default_module'])) {
+ $items['search_default_module']->value = 'search_facetapi';
+ }
+ }
+
+ // Add the Facet API and User search types as Custom Search search options.
+ if (isset($items['custom_search_other'])) {
+ $items['custom_search_other']->value['search_facetapi'] = 'search_facetapi';
+ $items['custom_search_other']->value['user'] = 'user';
+ }
+}
diff --git a/modules/commons/commons_search/modules/commons_search_solr/commons_search_solr.info b/modules/commons/commons_search/modules/commons_search_solr/commons_search_solr.info
index e11e27a..22e44a0 100644
--- a/modules/commons/commons_search/modules/commons_search_solr/commons_search_solr.info
+++ b/modules/commons/commons_search/modules/commons_search_solr/commons_search_solr.info
@@ -1,7 +1,8 @@
-name = Commons Search Solr
-description = Site search using Apache Solr server.
-core = 7.x
+name = Commons Search SOLR
+description = Provides integration between the Apache Solr module and Commons Search.
package = Commons - Search
+core = 7.x
+
dependencies[] = apachesolr
dependencies[] = apachesolr_proximity
dependencies[] = apachesolr_search
@@ -12,6 +13,7 @@ dependencies[] = facetapi
dependencies[] = page_manager
dependencies[] = pm_existing_pages
dependencies[] = strongarm
+
features[apachesolr_search_page][] = core_search
features[ctools][] = apachesolr_search:apachesolr_search_defaults:3
features[ctools][] = facetapi:facetapi_defaults:1
@@ -22,15 +24,12 @@ features[features_api][] = api:2
features[page_manager_existing_pages][] = solr_search
features[page_manager_handlers][] = pm_existing_pages_solr_search_panel_context
features[variable][] = apachesolr_search_default_search_page
-features[variable][] = custom_search_other
features[variable][] = page_manager_search_disabled_apachesolr_search
features[variable][] = pm_existing_pages_disabled_solr_search
-features[variable][] = search_active_modules
-features[variable][] = search_default_module
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_search/modules/commons_search_solr/commons_search_solr.strongarm.inc b/modules/commons/commons_search/modules/commons_search_solr/commons_search_solr.strongarm.inc
index ee2a643..b5f7f1c 100644
--- a/modules/commons/commons_search/modules/commons_search_solr/commons_search_solr.strongarm.inc
+++ b/modules/commons/commons_search/modules/commons_search_solr/commons_search_solr.strongarm.inc
@@ -17,16 +17,6 @@ function commons_search_solr_strongarm() {
$strongarm->value = 'core_search';
$export['apachesolr_search_default_search_page'] = $strongarm;
- $strongarm = new stdClass();
- $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
- $strongarm->api_version = 1;
- $strongarm->name = 'custom_search_other';
- $strongarm->value = array(
- 'apachesolr_search' => 'apachesolr_search',
- 'user' => 'user',
- );
- $export['custom_search_other'] = $strongarm;
-
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
@@ -41,21 +31,26 @@ function commons_search_solr_strongarm() {
$strongarm->value = FALSE;
$export['pm_existing_pages_disabled_solr_search'] = $strongarm;
- $strongarm = new stdClass();
- $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
- $strongarm->api_version = 1;
- $strongarm->name = 'search_active_modules';
- $strongarm->value = array(
- 'apachesolr_search' => 'apachesolr_search',
- );
- $export['search_active_modules'] = $strongarm;
-
- $strongarm = new stdClass();
- $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
- $strongarm->api_version = 1;
- $strongarm->name = 'search_default_module';
- $strongarm->value = 'apachesolr_search';
- $export['search_default_module'] = $strongarm;
-
return $export;
}
+
+/**
+ * Implements hook_strongarm_alter().
+ */
+function commons_search_solr_strongarm_alter(&$items) {
+ // Enable the Apache SOLR search module.
+ if (isset($items['search_active_modules'])) {
+ $items['search_active_modules']->value['apachesolr_search'] = 'apachesolr_search';
+ }
+
+ // Set Apache SOLR as the default search module.
+ if (isset($items['search_default_module'])) {
+ $items['search_default_module']->value = 'apachesolr_search';
+ }
+
+ // Add the Apache SOLR and User search types as Custom Search search options.
+ if (isset($items['custom_search_other'])) {
+ $items['custom_search_other']->value['apachesolr_search'] = 'apachesolr_search';
+ $items['custom_search_other']->value['user'] = 'user';
+ }
+}
diff --git a/modules/commons/commons_search/modules/commons_search_solr_user/commons_search_solr_user.info b/modules/commons/commons_search/modules/commons_search_solr_user/commons_search_solr_user.info
index b010753..206549c 100644
--- a/modules/commons/commons_search/modules/commons_search_solr_user/commons_search_solr_user.info
+++ b/modules/commons/commons_search/modules/commons_search_solr_user/commons_search_solr_user.info
@@ -1,20 +1,23 @@
-name = Commons Search Solr User
-description = Provides user entity indexing capabilities to Apache Solr, and search functionality
-core = 7.x
+name = Commons Search SOLR User
+description = Adds support for searching users to the Commons Search SOLR module.
package = Commons - Search
+core = 7.x
+
dependencies[] = apachesolr_search
dependencies[] = apachesolr_user
dependencies[] = commons_search_solr
dependencies[] = ctools
dependencies[] = features
dependencies[] = menu
+
features[apachesolr_search_page][] = user_search
features[ctools][] = apachesolr_search:apachesolr_search_defaults:3
-features[features_api][] = api:1
+features[features_api][] = api:2
features[menu_links][] = main-menu:people
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_site_homepage/commons_site_homepage.info b/modules/commons/commons_site_homepage/commons_site_homepage.info
index b53cb8c..b9e0595 100644
--- a/modules/commons/commons_site_homepage/commons_site_homepage.info
+++ b/modules/commons/commons_site_homepage/commons_site_homepage.info
@@ -1,7 +1,8 @@
name = Commons Site Homepage
-description = Provides a homepage for the site for anonymous and authenticated users
-core = 7.x
+description = Provides a customizable homepage for the site which has unique displays for anonymous and authenticated users.
package = Commons - Landing pages
+core = 7.x
+
dependencies[] = commons_activity_streams
dependencies[] = commons_featured
dependencies[] = commons_follow
@@ -10,6 +11,7 @@ dependencies[] = page_manager
dependencies[] = strongarm
dependencies[] = views
dependencies[] = views_litepager
+
features[ctools][] = page_manager:pages_default:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
@@ -17,11 +19,12 @@ features[features_api][] = api:2
features[page_manager_pages][] = commons_home
features[variable][] = site_frontpage
features[views_view][] = commons_homepage_content
+
features_exclude[dependencies][views_content] = views_content
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_social_sharing/commons_social_sharing.info b/modules/commons/commons_social_sharing/commons_social_sharing.info
index 04b34b0..1abd18d 100644
--- a/modules/commons/commons_social_sharing/commons_social_sharing.info
+++ b/modules/commons/commons_social_sharing/commons_social_sharing.info
@@ -1,10 +1,12 @@
name = Commons Social Sharing
-description = Provide links to share content to external social services such as Facebook and Google+
-core = 7.x
+description = Provide links to share content to external social services such as Facebook and Google+.
package = Commons - Building blocks
+core = 7.x
+
dependencies[] = ctools
dependencies[] = sharethis
dependencies[] = strongarm
+
features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2
features[variable][] = sharethis_button_option
@@ -17,9 +19,9 @@ features[variable][] = sharethis_teaser_option
features[variable][] = sharethis_weight
features[variable][] = sharethis_widget_option
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
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 d43d7b9..3f62fa8 100644
--- a/modules/commons/commons_topics/commons_topics.features.field_base.inc
+++ b/modules/commons/commons_topics/commons_topics.features.field_base.inc
@@ -17,14 +17,6 @@ function commons_topics_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_topics',
- 'foreign keys' => array(
- 'tid' => array(
- 'columns' => array(
- 'tid' => 'tid',
- ),
- 'table' => 'taxonomy_term_data',
- ),
- ),
'indexes' => array(
'tid' => array(
0 => 'tid',
diff --git a/modules/commons/commons_topics/commons_topics.info b/modules/commons/commons_topics/commons_topics.info
index 2f6d949..3a178f0 100644
--- a/modules/commons/commons_topics/commons_topics.info
+++ b/modules/commons/commons_topics/commons_topics.info
@@ -1,15 +1,18 @@
name = Commons Topics
-core = 7.x
+description = Provides a simple taxonomy field for re-use by various Commons content types.
package = Commons - Building blocks
+core = 7.x
+
dependencies[] = features
dependencies[] = taxonomy
+
features[features_api][] = api:2
features[field_base][] = field_topics
features[taxonomy][] = topics
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_trusted_contacts/commons_trusted_contacts.features.field_base.inc b/modules/commons/commons_trusted_contacts/commons_trusted_contacts.features.field_base.inc
index 3edeb77..c44c333 100644
--- a/modules/commons/commons_trusted_contacts/commons_trusted_contacts.features.field_base.inc
+++ b/modules/commons/commons_trusted_contacts/commons_trusted_contacts.features.field_base.inc
@@ -17,14 +17,6 @@ function commons_trusted_contacts_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_approving_user',
- 'foreign keys' => array(
- 'users' => array(
- 'columns' => array(
- 'target_id' => 'uid',
- ),
- 'table' => 'users',
- ),
- ),
'indexes' => array(
'target_id' => array(
0 => 'target_id',
@@ -58,7 +50,6 @@ function commons_trusted_contacts_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_confirmation',
- 'foreign keys' => array(),
'indexes' => array(
'value' => array(
0 => 'value',
@@ -84,14 +75,6 @@ function commons_trusted_contacts_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_membership_token',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -113,7 +96,6 @@ function commons_trusted_contacts_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_my_request',
- 'foreign keys' => array(),
'indexes' => array(
'value' => array(
0 => 'value',
@@ -139,14 +121,6 @@ function commons_trusted_contacts_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_original_og_membership',
- 'foreign keys' => array(
- 'og_membership' => array(
- 'columns' => array(
- 'target_id' => 'id',
- ),
- 'table' => 'og_membership',
- ),
- ),
'indexes' => array(
'target_id' => array(
0 => 'target_id',
@@ -182,14 +156,6 @@ function commons_trusted_contacts_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_requesting_user',
- 'foreign keys' => array(
- 'users' => array(
- 'columns' => array(
- 'target_id' => 'uid',
- ),
- 'table' => 'users',
- ),
- ),
'indexes' => array(
'target_id' => array(
0 => 'target_id',
@@ -223,7 +189,6 @@ function commons_trusted_contacts_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_response_date',
- 'foreign keys' => array(),
'indexes' => array(),
'locked' => 0,
'module' => 'date',
@@ -253,14 +218,6 @@ function commons_trusted_contacts_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'og_user_group_ref',
- 'foreign keys' => array(
- 'users' => array(
- 'columns' => array(
- 'target_id' => 'uid',
- ),
- 'table' => 'users',
- ),
- ),
'indexes' => array(
'target_id' => array(
0 => 'target_id',
@@ -295,14 +252,6 @@ function commons_trusted_contacts_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'user_trusted_contacts',
- 'foreign keys' => array(
- 'users' => array(
- 'columns' => array(
- 'target_id' => 'uid',
- ),
- 'table' => 'users',
- ),
- ),
'indexes' => array(
'target_id' => array(
0 => 'target_id',
diff --git a/modules/commons/commons_trusted_contacts/commons_trusted_contacts.info b/modules/commons/commons_trusted_contacts/commons_trusted_contacts.info
index 734902c..b084c26 100644
--- a/modules/commons/commons_trusted_contacts/commons_trusted_contacts.info
+++ b/modules/commons/commons_trusted_contacts/commons_trusted_contacts.info
@@ -1,7 +1,8 @@
name = Commons Trusted Contacts
-description = Commons Trusted Contacts Functionality
-core = 7.x
+description = Allows users to build and manage a list of contacts which they can message and interact with.
package = Commons - Building blocks
+core = 7.x
+
dependencies[] = commons_groups
dependencies[] = ctools
dependencies[] = date
@@ -17,6 +18,7 @@ dependencies[] = privatemsg
dependencies[] = strongarm
dependencies[] = text
dependencies[] = views
+
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
@@ -49,13 +51,15 @@ features[variable][] = field_bundle_settings_message__trusted_contact_request_pe
features[variable][] = privatemsg_display_profile_links
features[views_view][] = trusted_contacts
features[views_view][] = trusted_contacts_invitations
+
features_exclude[field][message-trusted_contact_request_approved-field_approving_user] = message-trusted_contact_request_approved-field_approving_user
features_exclude[field][message-trusted_contact_request_pending-field_requesting_user] = message-trusted_contact_request_pending-field_requesting_user
+
files[] = views/handlers/commons_groups_handler_send_message.inc
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_trusted_contacts/commons_trusted_contacts.module b/modules/commons/commons_trusted_contacts/commons_trusted_contacts.module
index 1e7c953..2b01a71 100644
--- a/modules/commons/commons_trusted_contacts/commons_trusted_contacts.module
+++ b/modules/commons/commons_trusted_contacts/commons_trusted_contacts.module
@@ -53,7 +53,7 @@ function commons_trusted_contacts_pathauto_alias_alter(&$alias, &$context) {
if (og_get_group_type('node', $context['data']['node']->type, 'group content')
&& !empty($context['data']['node']->og_user_group_ref[LANGUAGE_NONE])
) {
- $alias = token_replace('users/[node:og-user-group-ref:0:name]/trusted-content/[node:title]', $context['data'], array(
+ $alias = token_replace('users/[node:author:name]/trusted-content/[node:title]', $context['data'], array(
'sanitize' => FALSE,
'clear' => TRUE,
'callback' => 'pathauto_clean_token_values',
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 bf89c7a..838e6b5 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
@@ -1,20 +1,22 @@
name = Commons User Profile Pages
-description = Exports a default user profile page, powered by the Panels module.
-core = 7.x
+description = Provides a landing page which lists user information.
package = Commons - Landing pages
+core = 7.x
+
dependencies[] = commons_activity_streams
dependencies[] = commons_follow
dependencies[] = commons_profile_base
dependencies[] = commons_profile_social
dependencies[] = ctools
dependencies[] = page_manager
+
features[ctools][] = page_manager:pages_default:1
features[features_api][] = api:2
features[page_manager_handlers][] = user_view_panel_context
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_utility_links/commons_utility_links.info b/modules/commons/commons_utility_links/commons_utility_links.info
index b1385c4..ded950b 100644
--- a/modules/commons/commons_utility_links/commons_utility_links.info
+++ b/modules/commons/commons_utility_links/commons_utility_links.info
@@ -1,9 +1,13 @@
+name = Commons Utility Links
+description = Provides a block which displays a list of useful links.
+package = Commons - Building blocks
core = 7.x
-name = Commons Utility links block
-package = "Commons - Building blocks"
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+
+dependencies[] = block
+
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
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 56f04cd..9923eed 100644
--- a/modules/commons/commons_wikis/commons_wikis.features.field_instance.inc
+++ b/modules/commons/commons_wikis/commons_wikis.features.field_instance.inc
@@ -74,7 +74,7 @@ function commons_wikis_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
- 'weight' => 0,
+ 'weight' => -49,
),
'teaser' => array(
'label' => 'hidden',
@@ -83,7 +83,7 @@ function commons_wikis_field_default_field_instances() {
'trim_length' => 600,
),
'type' => 'text_summary_or_trimmed',
- 'weight' => 1,
+ 'weight' => -49,
),
),
'display_in_partial_form' => 1,
@@ -104,7 +104,7 @@ function commons_wikis_field_default_field_instances() {
'summary_rows' => 5,
),
'type' => 'text_textarea_with_summary',
- 'weight' => 1,
+ 'weight' => -49,
),
);
@@ -119,13 +119,13 @@ function commons_wikis_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 12,
+ 'weight' => -50,
),
'teaser' => array(
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 0,
+ 'weight' => -50,
),
),
'display_in_partial_form' => 1,
@@ -148,7 +148,7 @@ function commons_wikis_field_default_field_instances() {
'size' => 60,
),
'type' => 'text_textfield',
- 'weight' => -5,
+ 'weight' => -50,
),
);
diff --git a/modules/commons/commons_wikis/commons_wikis.info b/modules/commons/commons_wikis/commons_wikis.info
index 7f3cac4..60cf7fd 100644
--- a/modules/commons/commons_wikis/commons_wikis.info
+++ b/modules/commons/commons_wikis/commons_wikis.info
@@ -1,9 +1,9 @@
-name = Commons Wikis
-description = Provides the wiki functionality for Drupal Commons
-core = 7.x
+name = Commons Wiki
+description = Provides a Wiki content type for collaboratively revising content.
package = Commons - Content types
+core = 7.x
+
dependencies[] = commons_body
-dependencies[] = commons_groups
dependencies[] = commons_topics
dependencies[] = ctools
dependencies[] = entity
@@ -21,6 +21,7 @@ dependencies[] = text
dependencies[] = views
dependencies[] = views_content
dependencies[] = views_litepager
+
features[ctools][] = page_manager:pages_default:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
@@ -60,11 +61,20 @@ features[variable][] = show_diff_inline_wiki
features[variable][] = show_preview_changes_wiki
features[views_view][] = commons_bw_wikis
features[views_view][] = commons_wikis_contributor_list
+
+; Manually remove the Commons Browsing Widget module as a dependency as Commons
+; Wikis views currently triggers features to auto-detect it as a dependency.
+
+; The other Commons content modules do not need to do this because Commons
+; Browsing Widget automatically removes itself as a dependency for any module
+; that supports automatic title replacement (currently every content type except
+; for wikis).
+features_exclude[dependencies][commons_bw] = commons_bw
features_exclude[dependencies][commons_trusted_contacts] = commons_trusted_contacts
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_wikis/commons_wikis.install b/modules/commons/commons_wikis/commons_wikis.install
index 5d854af..3c9447a 100644
--- a/modules/commons/commons_wikis/commons_wikis.install
+++ b/modules/commons/commons_wikis/commons_wikis.install
@@ -121,3 +121,14 @@ function commons_wikis_update_7009() {
features_revert($revert);
return array();
}
+
+/**
+ * Standardize browsing widget field weights.
+ */
+function commons_wikis_update_7010() {
+ $revert = array(
+ 'commons_wikis' => array('field_instance'),
+ );
+ features_revert($revert);
+ return array();
+}
diff --git a/modules/commons/commons_wikis/commons_wikis.module b/modules/commons/commons_wikis/commons_wikis.module
index 601badb..c2ecaa7 100644
--- a/modules/commons/commons_wikis/commons_wikis.module
+++ b/modules/commons/commons_wikis/commons_wikis.module
@@ -136,20 +136,6 @@ function commons_wikis_form_commons_bw_partial_node_form_after_build($form) {
* Implements hook_strongarm_alter().
*/
function commons_wikis_strongarm_alter(&$items) {
- // Expose the wiki content type for 'liking' via the Commons_like module
- // by altering the configuration for the Rate.module widget that it provides.
- if (!empty($items['rate_widgets']->value)) {
- foreach($items['rate_widgets']->value as $key => $widget) {
- if ($widget->name == 'commons_like') {
- if (!in_array('wiki', $items['rate_widgets']->value[$key]->node_types)) {
- $items['rate_widgets']->value[$key]->node_types[] = 'wiki';
- }
- if (!in_array('wiki', $items['rate_widgets']->value[$key]->comment_types)) {
- $items['rate_widgets']->value[$key]->comment_types[] = 'wiki';
- }
- }
- }
- }
// Expose the wiki content type for integration with Commons Radioactivity
// and Commons Groups.
foreach (array('commons_radioactivity_entity_types', 'commons_groups_entity_types') as $key) {
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 6677ef2..18ce471 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
@@ -1,20 +1,22 @@
-name = Commons Wikis Home
-description = Provides the panelizer feature for Wikis.
+name = Commons Wikis Pages
+description = Enhances the appearance of wiki nodes by listing the contributors to the wiki and allows them to be customized.
core = 7.x
package = Commons - Landing pages
+
dependencies[] = commons_wikis
dependencies[] = ctools
dependencies[] = panelizer
dependencies[] = strongarm
+
features[ctools][] = panelizer:panelizer:1
features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2
features[panelizer_defaults][] = node:wiki:default
features[variable][] = panelizer_defaults_node_wiki
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
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 9974e8a..3e98460 100644
--- a/modules/commons/commons_wysiwyg/commons_wysiwyg.features.ckeditor_profile.inc
+++ b/modules/commons/commons_wysiwyg/commons_wysiwyg.features.ckeditor_profile.inc
@@ -72,6 +72,22 @@ function commons_wysiwyg_ckeditor_profile_defaults() {
'filtered_html' => 'Filtered HTML',
),
),
+ 'CKEditor Global Profile' => array(
+ 'name' => 'CKEditor Global Profile',
+ 'settings' => array(
+ 'skin' => 'moono',
+ 'ckeditor_path' => '%l/ckeditor',
+ 'ckeditor_local_path' => '',
+ 'ckeditor_plugins_path' => '%m/plugins',
+ 'ckeditor_plugins_local_path' => '',
+ 'ckfinder_path' => '%m/ckfinder',
+ 'ckfinder_local_path' => '',
+ 'ckeditor_aggregate' => 'f',
+ 'toolbar_wizard' => 't',
+ 'loadPlugins' => array(),
+ ),
+ 'input_formats' => array(),
+ ),
);
return $data;
}
diff --git a/modules/commons/commons_wysiwyg/commons_wysiwyg.info b/modules/commons/commons_wysiwyg/commons_wysiwyg.info
index 1a58f3d..a462227 100644
--- a/modules/commons/commons_wysiwyg/commons_wysiwyg.info
+++ b/modules/commons/commons_wysiwyg/commons_wysiwyg.info
@@ -1,20 +1,30 @@
name = Commons WYSIWYG
description = Provides a rich text editor for content creation.
-core = 7.x
package = Commons - Building blocks
+core = 7.x
+
dependencies[] = ckeditor
dependencies[] = features
dependencies[] = filter
dependencies[] = strongarm
+
features[ckeditor_profile][] = Advanced
+features[ckeditor_profile][] = CKEditor Global Profile
features[features_api][] = api:2
features[filter][] = filtered_html
features[filter][] = full_html
features[user_permission][] = use text format filtered_html
-; Information added by Drupal.org packaging script on 2014-06-25
-version = "7.x-3.15"
+; Manually remove the Entity Embed and Media: WYSIWYG modules as dependencies
+; until https://www.drupal.org/node/766264 is fixed which causes Commons WYSIWYG
+; to appear overridden due dynamic alterations made to the text format and
+; CKEditor profiles by the Commons Media module.
+features_exclude[dependencies][media_wysiwyg] = entity_embed
+features_exclude[dependencies][entity_embed] = media_wysiwyg
+
+; Information added by Drupal.org packaging script on 2015-03-18
+version = "7.x-3.23"
core = "7.x"
project = "commons"
-datestamp = "1403672628"
+datestamp = "1426714630"
diff --git a/modules/commons/commons_wysiwyg/commons_wysiwyg.install b/modules/commons/commons_wysiwyg/commons_wysiwyg.install
index 01e80d9..fa07212 100644
--- a/modules/commons/commons_wysiwyg/commons_wysiwyg.install
+++ b/modules/commons/commons_wysiwyg/commons_wysiwyg.install
@@ -23,3 +23,14 @@ function commons_wysiwyg_update_3101() {
features_revert($revert);
return array();
}
+
+/**
+ * Prefer a local copy of CKEditor by default.
+ */
+function commons_wysiwyg_update_3102() {
+ $revert = array(
+ 'commons_wysiwyg' => array('ckeditor_profile'),
+ );
+ features_revert($revert);
+ return array();
+}
diff --git a/modules/commons/commons_wysiwyg/commons_wysiwyg.module b/modules/commons/commons_wysiwyg/commons_wysiwyg.module
index 98f2347..6cc147a 100644
--- a/modules/commons/commons_wysiwyg/commons_wysiwyg.module
+++ b/modules/commons/commons_wysiwyg/commons_wysiwyg.module
@@ -1,22 +1,54 @@
= 2 && array_key_exists('filtered_html', $formats)) {
+ $element['format']['#access'] = FALSE;
$element['#format'] = 'filtered_html';
}
+
return $element;
-}
\ No newline at end of file
+}
diff --git a/patches/0001-utility-links-block-install-theme.patch b/patches/0001-utility-links-block-install-theme.patch
index e1ff7ff..2913ba6 100644
--- a/patches/0001-utility-links-block-install-theme.patch
+++ b/patches/0001-utility-links-block-install-theme.patch
@@ -1,30 +1,43 @@
-diff -Naur a/commons_utility_links.install b/commons_utility_links.install
---- a/commons_utility_links.install 2013-10-24 19:50:45.000000000 +0000
-+++ b/commons_utility_links.install 2013-10-24 20:56:41.575728538 +0000
-@@ -13,7 +13,7 @@
+diff -Naur commons_utility_links.orig/commons_utility_links.install commons_utility_links/commons_utility_links.install
+--- commons_utility_links.orig/commons_utility_links.install 2015-03-24 13:44:17.000000000 +0100
++++ commons_utility_links/commons_utility_links.install 2015-03-24 13:43:43.000000000 +0100
+@@ -9,11 +9,12 @@
+ */
+ function commons_utility_links_install() {
+ cache_clear_all('*', 'cache_block', TRUE);
++ $theme = variable_get('theme_default', 'openstack_bootstrap');
+ // Place site blocks in the menu_bar and header regions.
$utility_block = array(
'module' => 'commons_utility_links',
'delta' => 'commons_utility_links',
- 'theme' => 'commons_origins',
-+ 'theme' => 'openstack',
++ 'theme' => $theme,
'visibility' => 0,
'region' => 'header',
'status' => 1,
-@@ -28,7 +28,7 @@
+@@ -28,7 +29,7 @@
->fields(array('cache' => DRUPAL_NO_CACHE))
->condition('delta', 'commons_utility_links')
->condition('module', 'commons_utility_links')
- ->condition('theme', 'commons_origins')
-+ ->condition('theme', 'openstack')
++ ->condition('theme', $theme)
->execute();
}
-@@ -50,7 +50,7 @@
+@@ -36,6 +37,7 @@
+ * Remove utility_links block, and enable commons_utility_links, that never caches.
+ */
+ function commons_utility_links_update_7301() {
++ $theme = variable_get('theme_default', 'openstack_bootstrap');
+ db_delete('block')
+ ->condition('module', 'commons_utility_links')
+ ->condition('delta', 'utility_links')
+@@ -50,7 +52,7 @@
))
->condition('delta', 'commons_utility_links')
->condition('module', 'commons_utility_links')
- ->condition('theme', 'commons_origins')
-+ ->condition('theme', 'openstack')
++ ->condition('theme', $theme)
->execute();
cache_clear_all('*', 'cache_block', TRUE);
}
diff --git a/patches/0002-events-page-refactor-to-pages-module.patch b/patches/0002-events-page-refactor-to-pages-module.patch
index a0ce167..6960d08 100644
--- a/patches/0002-events-page-refactor-to-pages-module.patch
+++ b/patches/0002-events-page-refactor-to-pages-module.patch
@@ -1,6 +1,6 @@
diff -Naur commons_events.orig/commons_events.features.inc commons_events/commons_events.features.inc
---- commons_events.orig/commons_events.features.inc 2014-07-21 16:24:34.000000000 +0200
-+++ commons_events/commons_events.features.inc 2014-07-21 16:17:30.000000000 +0200
+--- commons_events.orig/commons_events.features.inc 2015-03-24 11:51:25.000000000 +0100
++++ commons_events/commons_events.features.inc 2015-03-24 11:40:47.000000000 +0100
@@ -8,9 +8,6 @@
* Implements hook_ctools_plugin_api().
*/
@@ -12,28 +12,28 @@ diff -Naur commons_events.orig/commons_events.features.inc commons_events/common
return array("version" => "1");
}
diff -Naur commons_events.orig/commons_events.info commons_events/commons_events.info
---- commons_events.orig/commons_events.info 2014-07-21 16:24:34.000000000 +0200
-+++ commons_events/commons_events.info 2014-07-21 16:22:45.000000000 +0200
-@@ -37,7 +37,6 @@
- dependencies[] = views
+--- commons_events.orig/commons_events.info 2015-03-24 11:51:25.000000000 +0100
++++ commons_events/commons_events.info 2015-03-24 11:42:17.000000000 +0100
+@@ -39,7 +39,6 @@
dependencies[] = views_content
dependencies[] = views_load_more
+
-features[ctools][] = page_manager:pages_default:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
-@@ -70,7 +69,6 @@
+@@ -72,7 +71,6 @@
features[og_features_permission][] = node:group:delete own event content
features[og_features_permission][] = node:group:update any event content
features[og_features_permission][] = node:group:update own event content
-features[page_manager_pages][] = views_events_landing_page
features[registration_type][] = event
- features[schemaorg][] = node-event
features[user_permission][] = create event content
+ features[user_permission][] = create event registration
diff -Naur commons_events.orig/commons_events.pages_default.inc commons_events/commons_events.pages_default.inc
---- commons_events.orig/commons_events.pages_default.inc 2014-07-21 16:24:34.000000000 +0200
+--- commons_events.orig/commons_events.pages_default.inc 2015-03-24 11:51:25.000000000 +0100
+++ commons_events/commons_events.pages_default.inc 1970-01-01 01:00:00.000000000 +0100
-@@ -1,193 +0,0 @@
+@@ -1,204 +0,0 @@
- 'none',
- 'settings' => NULL,
- );
-- $page->menu = array();
+- $page->menu = array(
+- 'type' => 'normal',
+- 'title' => 'Events',
+- 'weight' => '2',
+- 'name' => 'main-menu',
+- 'parent' => array(
+- 'type' => 'none',
+- 'title' => '',
+- 'weight' => 0,
+- 'name' => 'navigation',
+- ),
+- );
- $page->arguments = array();
- $page->conf = array(
- 'admin_paths' => FALSE,
@@ -228,8 +239,8 @@ diff -Naur commons_events.orig/commons_events.pages_default.inc commons_events/c
-
-}
diff -Naur commons_events.orig/modules/commons_events_pages/commons_events_pages.features.inc commons_events/modules/commons_events_pages/commons_events_pages.features.inc
---- commons_events.orig/modules/commons_events_pages/commons_events_pages.features.inc 2014-07-21 16:24:34.000000000 +0200
-+++ commons_events/modules/commons_events_pages/commons_events_pages.features.inc 2014-07-21 16:17:25.000000000 +0200
+--- commons_events.orig/modules/commons_events_pages/commons_events_pages.features.inc 2015-03-24 11:51:25.000000000 +0100
++++ commons_events/modules/commons_events_pages/commons_events_pages.features.inc 2015-03-24 11:41:11.000000000 +0100
@@ -14,4 +14,7 @@
if ($module == "strongarm" && $api == "strongarm") {
return array("version" => "1");
@@ -239,10 +250,10 @@ diff -Naur commons_events.orig/modules/commons_events_pages/commons_events_pages
+ }
}
diff -Naur commons_events.orig/modules/commons_events_pages/commons_events_pages.info commons_events/modules/commons_events_pages/commons_events_pages.info
---- commons_events.orig/modules/commons_events_pages/commons_events_pages.info 2014-07-21 16:24:34.000000000 +0200
-+++ commons_events/modules/commons_events_pages/commons_events_pages.info 2014-07-21 16:22:37.000000000 +0200
-@@ -7,7 +7,9 @@
- dependencies[] = strongarm
+--- commons_events.orig/modules/commons_events_pages/commons_events_pages.info 2015-03-24 11:51:25.000000000 +0100
++++ commons_events/modules/commons_events_pages/commons_events_pages.info 2015-03-24 11:41:52.000000000 +0100
+@@ -9,7 +9,9 @@
+
features[ctools][] = panelizer:panelizer:1
features[ctools][] = strongarm:strongarm:1
+features[ctools][] = page_manager:pages_default:1
@@ -250,21 +261,21 @@ diff -Naur commons_events.orig/modules/commons_events_pages/commons_events_pages
+features[page_manager_pages][] = views_events_landing_page
features[panelizer_defaults][] = node:event:default
features[variable][] = panelizer_defaults_node_event
- files[] = commons_events_pages.features.inc
+
diff -Naur commons_events.orig/modules/commons_events_pages/commons_events_pages.pages_default.inc commons_events/modules/commons_events_pages/commons_events_pages.pages_default.inc
--- commons_events.orig/modules/commons_events_pages/commons_events_pages.pages_default.inc 1970-01-01 01:00:00.000000000 +0100
-+++ commons_events/modules/commons_events_pages/commons_events_pages.pages_default.inc 2014-07-21 16:21:54.000000000 +0200
-@@ -0,0 +1,193 @@
++++ commons_events/modules/commons_events_pages/commons_events_pages.pages_default.inc 2015-03-24 10:33:46.000000000 +0100
+@@ -0,0 +1,204 @@
+disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+ $page->api_version = 1;
@@ -277,7 +288,18 @@ diff -Naur commons_events.orig/modules/commons_events_pages/commons_events_pages
+ 'type' => 'none',
+ 'settings' => NULL,
+ );
-+ $page->menu = array();
++ $page->menu = array(
++ 'type' => 'normal',
++ 'title' => 'Events',
++ 'weight' => '2',
++ 'name' => 'main-menu',
++ 'parent' => array(
++ 'type' => 'none',
++ 'title' => '',
++ 'weight' => 0,
++ 'name' => 'navigation',
++ ),
++ );
+ $page->arguments = array();
+ $page->conf = array(
+ 'admin_paths' => FALSE,