7.x-1.5 Release Candidate 2

profiles/wcm_base/CHANGELOG.txt

+WCM Base 7.x-1.5-rc2, 2018-02-19
+--------------------------------
+- WCM Base: Updated Panopoly to 1.50 per SA-CONTRIB-2018-013.
+
 WCM Base 7.x-1.5-rc1, 2018-02-09
 --------------------------------
 - WCM Base: Updated contrib modules Better Exposed Filters, ctools, Media, Mime Mail.

profiles/wcm_base/modules/contrib/entity/entity.info

@@ -25,9 +25,9 @@ files[] = views/handlers/entity_views_handler_field_uri.inc
 files[] = views/handlers/entity_views_handler_relationship_by_bundle.inc
 files[] = views/handlers/entity_views_handler_relationship.inc
 files[] = views/plugins/entity_views_plugin_row_entity_view.inc
-; Information added by Drupal.org packaging script on 2016-09-22
-version = "7.x-1.8"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
 core = "7.x"
 project = "entity"
-datestamp = "1474546503"
+datestamp = "1518620551"
 

profiles/wcm_base/modules/contrib/entity/entity.module

@@ -1088,9 +1088,10 @@ function entity_flush_caches() {
   // Care about entitycache tables.
   if (module_exists('entitycache')) {
     $tables = array();
-    foreach (entity_crud_get_info() as $entity_type => $entity_info) {
-      if (isset($entity_info['module']) && !empty($entity_info['entity cache'])) {
-        $tables[] = 'cache_entity_' . $entity_type;
+    $tables_created = variable_get('entity_cache_tables_created');
+    if (is_array($tables_created)) {
+      foreach ($tables_created as $module => $entity_cache_tables) {
+        $tables = array_merge($tables, $entity_cache_tables);
       }
     }
     return $tables;

profiles/wcm_base/modules/contrib/entity/entity_token.info

@@ -5,9 +5,9 @@ files[] = entity_token.tokens.inc
 files[] = entity_token.module
 dependencies[] = entity
 
-; Information added by Drupal.org packaging script on 2016-09-22
-version = "7.x-1.8"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
 core = "7.x"
 project = "entity"
-datestamp = "1474546503"
+datestamp = "1518620551"
 

profiles/wcm_base/modules/contrib/entity/includes/entity.wrapper.inc

@@ -121,7 +121,7 @@ abstract class EntityMetadataWrapper {
     if (!$this->validate($value)) {
       throw new EntityMetadataWrapperException(t('Invalid data value given. Be sure it matches the required data type and format. Value at !location: !value.', array(
         // An exception's message is output through check_plain().
-        '!value' => is_array($value) || is_object($value) ? var_export($value) : $value,
+        '!value' => is_array($value) || is_object($value) ? var_export($value, TRUE) : $value,
         '!location' => $this->debugIdentifierLocation(),
       )));
     }
@@ -755,7 +755,7 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
     if (!$this->validate($value)) {
       throw new EntityMetadataWrapperException(t('Invalid data value given. Be sure it matches the required data type and format. Value at !location: !value.', array(
         // An exception's message is output through check_plain().
-        '!value' => is_array($value) || is_object($value) ? var_export($value) : $value,
+        '!value' => is_array($value) || is_object($value) ? var_export($value, TRUE) : $value,
         '!location' => $this->debugIdentifierLocation(),
       )));
     }
@@ -1116,7 +1116,7 @@ class EntityListWrapper extends EntityMetadataWrapper implements IteratorAggrega
    */
   public function getIterator() {
     // In case there is no data available, just iterate over the first item.
-    return new EntityMetadataWrapperIterator($this, $this->dataAvailable() ? array_keys(parent::value()) : array(0));
+    return new EntityMetadataWrapperIterator($this, ($this->dataAvailable() && is_array(parent::value())) ? array_keys(parent::value()) : array(0));
   }
 
   /**

profiles/wcm_base/modules/contrib/entity/modules/callbacks.inc

@@ -673,7 +673,7 @@ function entity_metadata_no_hook_node_access($op, $node = NULL, $account = NULL)
     if (empty($node->vid) && in_array($op, array('create', 'update'))) {
       // This is a new node or the original node.
       if (isset($node->type)) {
-        $op = !empty($node->is_new) && $node->is_new ? 'create' : 'update';
+        $op = empty($node->nid) || !empty($node->is_new) ? 'create' : 'update';
         return node_access($op, $op == 'create' ? $node->type : $node, $account);
       }
       else {

profiles/wcm_base/modules/contrib/entity/tests/entity_feature.info

@@ -6,9 +6,9 @@ files[] = entity_feature.module
 dependencies[] = entity_test
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2016-09-22
-version = "7.x-1.8"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
 core = "7.x"
 project = "entity"
-datestamp = "1474546503"
+datestamp = "1518620551"
 

profiles/wcm_base/modules/contrib/entity/tests/entity_test.info

@@ -7,9 +7,9 @@ files[] = entity_test.install
 dependencies[] = entity
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2016-09-22
-version = "7.x-1.8"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
 core = "7.x"
 project = "entity"
-datestamp = "1474546503"
+datestamp = "1518620551"
 

profiles/wcm_base/modules/contrib/entity/tests/entity_test_i18n.info

@@ -5,9 +5,9 @@ dependencies[] = i18n_string
 package = Multilingual - Internationalization
 core = 7.x
 hidden = TRUE
-; Information added by Drupal.org packaging script on 2016-09-22
-version = "7.x-1.8"
+; Information added by Drupal.org packaging script on 2018-02-14
+version = "7.x-1.9"
 core = "7.x"
 project = "entity"
-datestamp = "1474546503"
+datestamp = "1518620551"
 

profiles/wcm_base/modules/contrib/entity/views/handlers/entity_views_handler_area_entity.inc

@@ -40,7 +40,7 @@ class entity_views_handler_area_entity extends views_handler_area {
     $form['entity_id'] = array(
       '#type' => 'textfield',
       '#title' => t('Entity id'),
-      '#description' => t('Choose the entity you want to display in the area.'),
+      '#description' => t('Choose the entity you want to display in the area. To render an entity given by a contextual filter use "%1" for the first argument, "%2" for the second, etc.'),
       '#default_value' => $this->options['entity_id'],
     );
 
@@ -105,6 +105,9 @@ class entity_views_handler_area_entity extends views_handler_area {
    * Render an entity using the view mode.
    */
   public function render_entity($entity_type, $entity_id, $view_mode) {
+    $tokens = $this->get_render_tokens();
+    // Replace argument tokens in entity id.
+    $entity_id = strtr($entity_id, $tokens);
     if (!empty($entity_type) && !empty($entity_id) && !empty($view_mode)) {
       $entity = entity_load_single($entity_type, $entity_id);
       if (!empty($this->options['bypass_access']) || entity_access('view', $entity_type, $entity)) {
@@ -117,4 +120,31 @@ class entity_views_handler_area_entity extends views_handler_area {
       return '';
     }
   }
+
+  /**
+   * Get the 'render' tokens to use for advanced rendering.
+   *
+   * This runs through all of the fields and arguments that
+   * are available and gets their values. This will then be
+   * used in one giant str_replace().
+   */
+  function get_render_tokens() {
+    $tokens = array();
+    if (!empty($this->view->build_info['substitutions'])) {
+      $tokens = $this->view->build_info['substitutions'];
+    }
+    $count = 0;
+    foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
+      $token = '%' . ++$count;
+      if (!isset($tokens[$token])) {
+        $tokens[$token] = '';
+      }
+      // Use strip tags as there should never be HTML in the path.
+      // However, we need to preserve special characters like " that
+      // were removed by check_plain().
+      $tokens['%' . $count] = $handler->argument;
+    }
+
+    return $tokens;
+  }
 }

profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt

+7.x-1.50, 2018-02-15
+-------------------
+- No changes since last release.
+
 7.x-1.49, 2017-12-13
 -------------------
 - No changes since last release.

profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info

@@ -37,9 +37,9 @@ features[page_manager_pages][] = panopoly_admin_layout_library
 features[page_manager_pages][] = panopoly_admin_page_library
 features[page_manager_pages][] = panopoly_admin_pane_library
 
-; Information added by Drupal.org packaging script on 2017-12-13
-version = "7.x-1.49"
+; Information added by Drupal.org packaging script on 2018-02-15
+version = "7.x-1.50"
 core = "7.x"
 project = "panopoly_admin"
-datestamp = "1513181893"
+datestamp = "1518716424"
 

profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt

+7.x-1.50, 2018-02-15
+-------------------
+- Update to Entity API 1.9.
+
 7.x-1.49, 2017-12-13
 -------------------
 - Improvements to breadcrumb handling.

profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info

@@ -82,9 +82,9 @@ features_exclude[variable][panelizer_taxonomy_term:panopoly_categories_allowed_t
 features_exclude[variable][panelizer_defaults_taxonomy_term_panopoly_categories] = panelizer_defaults_taxonomy_term_panopoly_categories
 features_exclude[variable][pathauto_taxonomy_term_panopoly_categories_pattern] = pathauto_taxonomy_term_panopoly_categories_pattern
 
-; Information added by Drupal.org packaging script on 2017-12-13
-version = "7.x-1.49"
+; Information added by Drupal.org packaging script on 2018-02-15
+version = "7.x-1.50"
 core = "7.x"
 project = "panopoly_core"
-datestamp = "1513181917"
+datestamp = "1518716438"
 

profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make

@@ -57,7 +57,7 @@ projects[pathauto][subdir] = contrib
 projects[token][version] = 1.7
 projects[token][subdir] = contrib
 
-projects[entity][version] = 1.8
+projects[entity][version] = 1.9
 projects[entity][subdir] = contrib
 
 projects[libraries][version] = 2.2

profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt

+7.x-1.50, 2018-02-15
+-------------------
+- Validation for reusable FPP's "Admin Title" doesn't fire except when uploading
+  images.
+- Allow widgets to control how their "example" is rendered on the "Add content"
+  dialog (including using a static image rather than rendering).
+- Allow widgets to control how their "example" is rendered on the "Add content"
+  dialog (including using a static image rather than rendering).
+
 7.x-1.49, 2017-12-13
 -------------------
 - No changes since last release.

profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info

@@ -15,9 +15,9 @@ stylesheets[all][] = css/panopoly-modal.css
 features[features_api][] = api:2
 files[] = plugins/views/panopoly_magic_plugin_display_panel_pane.inc
 
-; Information added by Drupal.org packaging script on 2017-12-13
-version = "7.x-1.49"
+; Information added by Drupal.org packaging script on 2018-02-15
+version = "7.x-1.50"
 core = "7.x"
 project = "panopoly_magic"
-datestamp = "1513181974"
+datestamp = "1518716473"
 

profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.module

@@ -809,9 +809,7 @@ function panopoly_magic_form_fieldable_panels_panes_fieldable_panels_pane_conten
   }
 
   // Add custom validation function for the reusable title
-  if (!empty($form_state['triggering_element']) && $form_state['triggering_element']['#value'] != 'Update Preview') {
-    $form['reusable']['admin_title']['#element_validate'][] = 'panopoly_magic_reusable_entity_validate';
-  }
+  $form['reusable']['admin_title']['#element_validate'][] = 'panopoly_magic_reusable_entity_validate';
 
   // Customize the view mode setting
   if (!empty($form['view_mode'])) {
@@ -1415,6 +1413,11 @@ function panopoly_magic_form_ctools_stylizer_edit_style_form_choose_alter(&$form
  *  Validator to ensure that reusable entites have titles.
  */
 function panopoly_magic_reusable_entity_validate($element, &$form_state, $form) {
+  // Don't validate if we're just updating the preview.
+  if (!empty($form_state['triggering_element']) && $form_state['triggering_element']['#value'] == 'Update Preview') {
+    return;
+  }
+
   // If the reusable entity checkbox is selected.
   if (!empty($form_state['values']['reusable'])) {
     // Ensure a title is present.
@@ -1506,24 +1509,113 @@ function panopoly_magic_views_pre_view(&$view) {
 }
 
 /**
- * Helper function to display the pane for showing previews in the add_content modal
+ * Default 'preview callback' for widgets when we can't find something more specific.
  */
-function _panopoly_magic_render_preview_pane(&$plugin, $renderer) {
-  $pane = panels_new_pane($plugin['type_name'], $plugin['subtype_name'], TRUE);
+function panopoly_magic_preview_callback_default($type, $subtype, $plugin, $renderer) {
+  $pane = panels_new_pane($type, $subtype, TRUE);
+
+  // Mix in requested settings.
+  if (!empty($plugin['preview settings'])) {
+    $pane->configuration = array_merge($pane->configuration, $plugin['preview settings']);
+  }
+
   $display = $renderer->display;
   $context = $renderer->display->context;
   $args = $renderer->display->args;
   $incoming_content = $renderer->display->incoming_content;
   $keywords = (!empty($renderer->display->keywords)) ? $renderer->display->keywords : array();
-  if ($content = ctools_content_render($pane->type, $pane->subtype, $pane->configuration, $keywords, $args, $context, $incoming_content)) {
+  $content = ctools_content_render($pane->type, $pane->subtype, $pane->configuration, $keywords, $args, $context, $incoming_content);
+  if ($content) {
+    return theme('panels_pane', array('content' => $content, 'pane' => $pane, 'display' => $display));
+  }
+}
+
+/**
+ * Default 'preview callback' for FPP widgets.
+ */
+function panopoly_magic_preview_callback_fpp($type, $subtype, $plugin, $renderer) {
+  if (!empty($plugin['entity_id'])) {
+    $fpp = fieldable_panels_panes_load_from_subtype($plugin['entity_id']);
+  }
+  elseif (!empty($plugin['preview settings'])) {
+    $values = $plugin['preview settings'];
+    $values['bundle'] = $plugin['bundle'];
+    $fpp = fieldable_panels_panes_create($values);
+  }
+  else {
+    // For a new (non-existant) FPP with no 'preview settings', don't show
+    // any preview.
+    return NULL;
+  }
+
+  // Set a property to it's possible to tell that the FPP is being rendered
+  // in a preview, for example, in the template.
+  $fpp->panopoly_magic_preview = TRUE;
+
+  $content = fieldable_panels_pane_view($fpp, 'full', NULL);
+  if ($content) {
+    $block = (object)array(
+      'title' => check_plain($fpp->title),
+      'content' => $content,
+    );
+    $pane = panels_new_pane($type, $subtype, TRUE);
+    return theme('panels_pane', array('content' => $block, 'pane' => $pane, 'display' => $renderer->display));
+  }
+}
+
+/**
+ * Default 'preview callback' for when a 'preview image' is used.
+ */
+function panopoly_magic_preview_callback_image($type, $subtype, $plugin, $renderer) {
+  return theme('image', array('path' => $plugin['preview image']));
+}
+
+/**
+ * Helper function to display the pane for showing previews in the add_content modal
+ */
+function _panopoly_magic_render_preview_pane(&$widget_vars, $renderer) {
+  $type = $widget_vars['type_name'];
+  $subtype = $widget_vars['subtype_name'];
+  $plugin = ctools_content_get_subtype($type, $subtype);
+
+  // Special case for reusable FPPs: by default we force the FPP callback so
+  // that the entity is rendered, and the custom callback or image isn't used.
+  // However, if a special key on the plugin subtype ('preview always') is set,
+  // then we won't force the FPP callback and the custom preview will always
+  // be used (regardless if it's a reusable FPP or not).
+  if ($type == 'fieldable_panels_pane' && !empty($plugin['entity_id']) && empty($plugin['preview always'])) {
+    $plugin['preview callback'] = 'panopoly_magic_preview_callback_fpp';
+  }
+
+  if (!empty($plugin['preview callback'])) {
+    $preview_callback = $plugin['preview callback'];
+  }
+  elseif (!empty($plugin['preview image'])) {
+    $preview_callback = 'panopoly_magic_preview_callback_image';
+  }
+  elseif ($type == 'fieldable_panels_pane') {
+    $preview_callback = 'panopoly_magic_preview_callback_fpp';
+  }
+  else {
+    $preview_callback = 'panopoly_magic_preview_callback_default';
+  }
+
+  if ($content = $preview_callback($type, $subtype, $plugin, $renderer)) {
+    // Permit the callback to return a render array.
+    if (is_array($content)) {
+      $content = drupal_render($content);
+    }
+
+    // Optionally strip JavaScript.
     $strip_js = variable_get('panopoly_magic_strip_js_from_preview', 0);
-    $plugin['preview'] = theme('panels_pane', array('content' => $content, 'pane' => $pane, 'display' => $display));
-    if (!empty($strip_js) && !empty($plugin['preview'])) {
-      $plugin['preview'] = preg_replace('#<script(.*?)>(.*?)</script>#is', '', $plugin['preview']);
+    if (!empty($strip_js) && !empty($content)) {
+      $content = preg_replace('#<script(.*?)>(.*?)</script>#is', '', $content);
     }
+
+    $widget_vars['preview'] = $content;
     drupal_add_js(array('panopoly_magic' => array(
-      'pane_add_preview_type' => $pane->type,
-      'pane_add_preview_subtype' => $pane->subtype,
+      'pane_add_preview_type' => $type,
+      'pane_add_preview_subtype' => $subtype,
     )), 'setting');
   }
 }
@@ -1544,16 +1636,16 @@ function panopoly_magic_preprocess_panels_add_content_modal(&$vars) {
       $query = drupal_get_query_parameters();
       $type_name = !empty($query['type_name']) ? $query['type_name'] : '';
       $sub_type = !empty($query['subtype_name']) ? $query['subtype_name'] : '';
-      $plugin = array(
+      $widget_vars = array(
         'type_name' => $type_name,
         'subtype_name' => $sub_type,
       );
-      _panopoly_magic_render_preview_pane($plugin, $vars['renderer']);
+      _panopoly_magic_render_preview_pane($widget_vars, $vars['renderer']);
       $vars['column_count'] = 1;
-      $vars['preview_single'] = isset($plugin['preview']) ? $plugin['preview'] : '';
+      $vars['preview_single'] = isset($widget_vars['preview']) ? $widget_vars['preview'] : '';
       $vars['preview_single_title'] = '';
-      foreach ($vars['categories'][$vars['category']]['content'] as $key => $plugin) {
-        if ($plugin['type_name'] == $type_name && $plugin['subtype_name'] == $sub_type) {
+      foreach ($vars['categories'][$vars['category']]['content'] as $key => $widget_vars) {
+        if ($widget_vars['type_name'] == $type_name && $widget_vars['subtype_name'] == $sub_type) {
           $vars['preview_single_title'] = $key;
           break;
         }
@@ -1561,7 +1653,7 @@ function panopoly_magic_preprocess_panels_add_content_modal(&$vars) {
     }
 
     // Process each widget option, either adding the preview itself or a link to generate it.
-    foreach ($vars['categories'][$vars['category']]['content'] as $key => &$plugin) {
+    foreach ($vars['categories'][$vars['category']]['content'] as $key => &$widget_vars) {
       $query = drupal_get_query_parameters();
       $preview_panes = (!empty($query['preview_panes'])) ? explode(',', $query['preview_panes']) : array();
 
@@ -1570,21 +1662,21 @@ function panopoly_magic_preprocess_panels_add_content_modal(&$vars) {
         // Convert the link to generate a preview of itself.
         $options = array(
           'query' => array(
-            'type_name' => $plugin['type_name'],
-            'subtype_name' => $plugin['subtype_name'],
+            'type_name' => $widget_vars['type_name'],
+            'subtype_name' => $widget_vars['subtype_name'],
           ),
           'attributes' => array('class' => array('use-ajax button')),
           'html' => TRUE,
         );
-        $plugin['title'] = l(filter_xss_admin($plugin['title']), current_path(), $options);
+        $widget_vars['title'] = l(filter_xss_admin($widget_vars['title']), current_path(), $options);
       }
-      elseif ($use_preview == PANOPOLY_ADD_PREVIEW_AUTOMATIC || in_array($plugin['subtype_name'], $preview_panes)) {
-        _panopoly_magic_render_preview_pane($plugin, $vars['renderer']);
+      elseif ($use_preview == PANOPOLY_ADD_PREVIEW_AUTOMATIC || in_array($widget_vars['subtype_name'], $preview_panes)) {
+        _panopoly_magic_render_preview_pane($widget_vars, $vars['renderer']);
       }
       else {
 
         // If we can't preview then generate a preview link.
-        $preview = empty($query['preview_panes']) ? $plugin['subtype_name'] : $query['preview_panes'] . ',' . $plugin['subtype_name'];
+        $preview = empty($query['preview_panes']) ? $widget_vars['subtype_name'] : $query['preview_panes'] . ',' . $widget_vars['subtype_name'];
         $options = array(
           'query' => array('preview_panes' => $preview),
           'attributes' => array(
@@ -1592,7 +1684,7 @@ function panopoly_magic_preprocess_panels_add_content_modal(&$vars) {
             'title' => t('Preview @widget widget', array('@widget' => $key)),
           ),
         );
-        $plugin['preview'] = '<div class="modal-content-preview-button">' . l(t('Preview'), current_path(), $options) . '</div>';
+        $widget_vars['preview'] = '<div class="modal-content-preview-button">' . l(t('Preview'), current_path(), $options) . '</div>';
       }
     }
   }

profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt

+7.x-1.50, 2018-02-15
+-------------------
+- No changes since last release.
+
 7.x-1.49, 2017-12-13
 -------------------
 - No changes since last release.

profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info

@@ -81,9 +81,9 @@ features_exclude[variable][pathauto_node_panopoly_landing_page_pattern] = pathau
 features_exclude[variable][pathauto_node_panopoly_page_pattern] = pathauto_node_panopoly_page_pattern
 features_exclude[variable][pathauto_taxonomy_term_panopoly_categories_pattern] = pathauto_taxonomy_term_panopoly_categories_pattern
 
-; Information added by Drupal.org packaging script on 2017-12-13
-version = "7.x-1.49"
+; Information added by Drupal.org packaging script on 2018-02-15
+version = "7.x-1.50"
 core = "7.x"
 project = "panopoly_pages"
-datestamp = "1513181985"
+datestamp = "1518716485"