From 8714efd750d8d6fee862849bc0a53d5e6c09d007 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Tue, 14 Nov 2017 14:05:28 -0500
Subject: [PATCH] Code simplification and bug fix. - If 'links' is undefined,
do not throw a notice. - Do not define unused $channelLinkData variable.
---
themes/bootstrap3/templates/channels/channelList.phtml | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/themes/bootstrap3/templates/channels/channelList.phtml b/themes/bootstrap3/templates/channels/channelList.phtml
index 788851f5d47..abdfc3acaeb 100644
--- a/themes/bootstrap3/templates/channels/channelList.phtml
+++ b/themes/bootstrap3/templates/channels/channelList.phtml
@@ -21,7 +21,6 @@
<? endif; ?>
<? $insideButton = false; ?>
-<? $channelLinkData = []; ?>
<? foreach ($channels as $channel): ?>
<?
$groupId = isset($channel['groupId'])
@@ -36,13 +35,9 @@
<? $insideButton = false; ?>
<? endif; ?>
<div class="channel-title">
- <h2><?=$this->escapeHtml($channel['title'])?>
- <? if (!empty($channel['links'])): ?>
- <? $channelLinkData[$channelID] = json_encode($channel['links']); ?>
- <? endif; ?>
- </h2>
+ <h2><?=$this->escapeHtml($channel['title'])?></h2>
</div>
- <div id="<?=$channelID ?>" class="channel" data-group="<?=$groupId ?>" data-link-json='<?=json_encode($channel['links']) ?>'>
+ <div id="<?=$channelID ?>" class="channel" data-group="<?=$groupId ?>" data-link-json='<?=empty($channel['links']) ? '[]' : json_encode($channel['links']) ?>'>
<!-- Wrapper for slides -->
<? foreach ($channel['contents'] as $item): ?>
<a href="<?=$this->recordLink()->getUrl("{$item['source']}|{$item['id']}")?>" class="channel-record slide" data-record-id="<?=$this->escapeHtmlAttr($item['id']) ?>" data-record-source="<?=$item['source'] ?>">
--
GitLab