Fix channel encoding/error handling. (#2687)

vufind-org · Jan 27, 2023 · 1909476 · 1909476
1 parent 38e6924
commit 1909476
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/themes/bootstrap3/js/channels.js b/themes/bootstrap3/js/channels.js
@@ -1,7 +1,13 @@
 /*global getUrlRoot, VuFind */
 VuFind.register('channels', function Channels() {
   function addLinkButtons(elem) {
-    var links = JSON.parse(elem.dataset.linkJson);
+    var links;
+    try {
+      links = JSON.parse(elem.dataset.linkJson);
+    } catch (e) {
+      console.error("Error parsing " + elem.dataset.linkJson);
+      return;
+    }
     if (links.length === 0) {
       return;
     }

diff --git a/themes/bootstrap3/templates/channels/channelList.phtml b/themes/bootstrap3/templates/channels/channelList.phtml
@@ -57,7 +57,7 @@
       </div>
     <?php endif; ?>
 
-    <div id="<?=$channelID ?>" class="channel" data-group="<?=$groupId ?>" data-link-json='<?=empty($channel['links']) ? '[]' : json_encode($channel['links']) ?>'>
+    <div id="<?=$channelID ?>" class="channel" data-group="<?=$groupId ?>" data-link-json='<?=empty($channel['links']) ? '[]' : json_encode($channel['links'], JSON_HEX_APOS) ?>'>
       <!-- Wrapper for slides -->
       <?php foreach ($channel['contents'] as $index => $item): ?>
         <?php $url = empty($item['routeDetails']) ? $this->recordLinker()->getUrl("{$item['source']}|{$item['id']}") : $this->url($item['routeDetails']['route'], $item['routeDetails']['params']); ?>