diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt index 9bf97f57b0bec79372c57a0aaa16af4e1445b5f7..cf307175981f87ce2e766d2012bcbd42cf52c284 100644 --- a/profiles/wcm_base/CHANGELOG.txt +++ b/profiles/wcm_base/CHANGELOG.txt @@ -1,6 +1,10 @@ +WCM Base 7.x-1.x, 2015-11-16 +---------------------------- +- WCM User Profile: Disable panelizer in user profile pages. + WCM Base 7.x-1.x, 2015-11-10 ---------------------------- -- OCIO Media Gallery: Created image gallery view pane with tag filtering. +- WCM Media Gallery: Created image gallery view pane with tag filtering. - OCIO News: Add tag filtering to news panes. - OCIO Panels Settings: Hide redirect settings on fieldable panel panes. - OCIO User Config: Replace username filter with real name filter on admin page. diff --git a/profiles/wcm_base/modules/contrib/uuid_features/includes/modules/book.inc b/profiles/wcm_base/modules/contrib/uuid_features/includes/modules/book.inc index 21fea4913d0501ca511e51ec685ff4d7d467f4d0..1af7c91ff391f3852d9dcc7dbc7e7708ab3bcfef 100644 --- a/profiles/wcm_base/modules/contrib/uuid_features/includes/modules/book.inc +++ b/profiles/wcm_base/modules/contrib/uuid_features/includes/modules/book.inc @@ -78,7 +78,7 @@ function book_uuid_node_features_rebuild_alter($node, $module) { // Set up node as for add child page. $node->book['plid'] = $parent_node->book['mlid']; $node->book['menu_name'] = $parent_node->book['menu_name']; - $node->book['weight'] = $node->book['weight']; + $node->book['weight'] = $parent_node->book['weight']; } else { // Add to pending. diff --git a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc index f156ae1e906d933fe35c9f127a0becb1fa0f4f79..6fdf61ee8567867bdd319fcecf975daedee95809 100644 --- a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc +++ b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc @@ -10,18 +10,20 @@ function uuid_user_features_export_options() { $options = array(); - $query = db_select('users', 'u') - ->fields('u', array('uid', 'name', 'mail', 'uuid')) - ->condition('u.uid', 0, '>') - ->orderBy('u.name', 'ASC') - ->addTag('uuid_user_features_export_options'); - - $results = $query->execute()->fetchAll(); - foreach ($results as $user) { - $options[$user->uuid] = t('@name: @mail', array( - '@name' => $user->name, - '@mail' => $user->mail, - )); + if (variable_get('uuid_features_entity_user_user', FALSE)) { + $query = db_select('users', 'u') + ->fields('u', array('uid', 'name', 'mail', 'uuid')) + ->condition('u.uid', 0, '>') + ->orderBy('u.name', 'ASC') + ->addTag('uuid_user_features_export_options'); + + $results = $query->execute()->fetchAll(); + foreach ($results as $user) { + $options[$user->uuid] = t('@name: @mail', array( + '@name' => $user->name, + '@mail' => $user->mail, + )); + } } return $options; diff --git a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info index d83cf180a7bceeba69bdf7f939ea985518a7ac24..f8527a9836947e69dfd344801df0221de2ccb773 100644 --- a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info +++ b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info @@ -8,9 +8,9 @@ package = Features configure = admin/structure/features/uuid_features -; Information added by Drupal.org packaging script on 2015-08-04 -version = "7.x-1.0-alpha4+75-dev" +; Information added by Drupal.org packaging script on 2015-11-16 +version = "7.x-1.0-alpha4+78-dev" core = "7.x" project = "uuid_features" -datestamp = "1438668540" +datestamp = "1447661660" diff --git a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module index 4e5ac682c232dd831bf44298f8162bfdb10704ec..689edb4cf2741f7a7b12dd43f406b6e15b8ef4b7 100644 --- a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module +++ b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module @@ -64,6 +64,7 @@ function uuid_features_entity_info_alter(&$entity_info) { 'commerce_product', 'field_collection_item', 'paragraphs_item', + 'user', ); if (module_exists('file_entity')) { $entity_types[] = 'file'; @@ -661,6 +662,8 @@ function uuid_features_file_field_import(&$import, $entity_type, $module = NULL) * * @param object &$file * The file, passed by reference. + * @param string $module + * The module name. * * @return bool * TRUE on success. On success the $file object will have a valid diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc index 62e87b8b23b49ccf552b183e9953da9c6c0d2c09..9730b77ffa7690d1acb71b2b364180d132b19ea5 100644 --- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc +++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc @@ -16,6 +16,15 @@ function wcm_user_profile_ctools_plugin_api($module = NULL, $api = NULL) { } } +/** + * Implements hook_strongarm_alter(). + */ +function wcm_user_profile_strongarm_alter(&$data) { + if (isset($data['panelizer_defaults_user_user'])) { + $data['panelizer_defaults_user_user']->value['status'] = 0; /* WAS: 1 */ + } +} + /** * Implements hook_image_default_styles(). */ diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info index 6cfa947ce69f500cf25f475bee0a030cb0bae831..22f75372e5c03f5c9a9ec4d36e984a5be588ccc1 100644 --- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info +++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info @@ -22,6 +22,7 @@ features[ds_fields][] = email features[ds_layout_settings][] = user|user|form features[ds_layout_settings][] = user|user|full features[features_api][] = api:2 +features[features_overrides][] = variable.panelizer_defaults_user_user.value|status features[field_base][] = field_bio features[field_base][] = field_first_name features[field_base][] = field_job_title