Commit 3ea31348 authored by Eric Bremner's avatar Eric Bremner
Browse files

Merge remote-tracking branch 'origin/1.0.x' into ebremner-m26lebla-watitis

parents be197b6f accfad9c
{% if featured_image == 'no' %} {% if media == 'no' %}
{% {%
set classes = [ set classes = [
'block', 'block',
......
...@@ -394,9 +394,9 @@ function uw_fdsu_theme_resp_preprocess_block(&$variables) { ...@@ -394,9 +394,9 @@ function uw_fdsu_theme_resp_preprocess_block(&$variables) {
// If we do then, set variable to not show page title. // If we do then, set variable to not show page title.
if ($variables['plugin_id'] == 'page_title_block') { if ($variables['plugin_id'] == 'page_title_block') {
// Set the featured image variable to no, we will only // Set the media variable to no, we will only
// change if there is a featured image. // change if there is a media.
$variables['featured_image'] = 'no'; $variables['media'] = 'no';
// Load the node. // Load the node.
$node = \Drupal::routeMatch()->getParameter('node'); $node = \Drupal::routeMatch()->getParameter('node');
...@@ -409,13 +409,13 @@ function uw_fdsu_theme_resp_preprocess_block(&$variables) { ...@@ -409,13 +409,13 @@ function uw_fdsu_theme_resp_preprocess_block(&$variables) {
$node = Node::load($node); $node = Node::load($node);
} }
// If there is a node, check that it has a featured image. // If there is a node, check that it has a media.
if ($node) { if ($node) {
// The UW service object. // The UW service object.
$uwService = \Drupal::service('uw_cfg_common.uw_service'); $uwService = \Drupal::service('uw_cfg_common.uw_service');
$variables['featured_image'] = $uwService->uwCheckNodeForFeaturedImage($node); $variables['media'] = $uwService->uwCheckNodeForMedia($node);
} }
} }
...@@ -508,7 +508,7 @@ function uw_fdsu_theme_resp_preprocess_container(&$variables) { ...@@ -508,7 +508,7 @@ function uw_fdsu_theme_resp_preprocess_container(&$variables) {
// Set variables for featured image. // Set variables for featured image.
$variables['node_type'] = str_replace('_', '-', $node->getType()); $variables['node_type'] = str_replace('_', '-', $node->getType());
$variables['featured_image'] = $uwService->uwCheckNodeForFeaturedImage($node); $variables['media'] = $uwService->uwCheckNodeForMedia($node);
// If there is a node object, get the header and footer data. // If there is a node object, get the header and footer data.
if ($node) { if ($node) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment