Merge branch 'release-4.1'

build.xml

@@ -28,7 +28,7 @@
   <property name="solr_version" value="6.4.2" />
   <property name="phpdoc_version" value="2.9.0" />
 
-  <property name="version" value="4.1" />
+  <property name="version" value="4.1.1" />
 
   <!-- We only need the -p switch if the password is non-blank -->
   <if><not><equals arg1="${mysqlrootpass}" arg2="" /></not><then>

config/vufind/config.ini

@@ -133,7 +133,7 @@ showBulkOptions = false
 ; Should users be allowed to save searches in their accounts?
 allowSavedSearches = true
 ; Generator value to display in an HTML header <meta> tag:
-generator = "VuFind 4.1"
+generator = "VuFind 4.1.1"
 
 ; This section allows you to configure the mechanism used for storing user
 ; sessions.  Available types: File, Memcache, Database.

package.json

 {
   "name": "vufind",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "Dev tools to handle css preprocessing, js magic, and compression",
   "repository": {
     "type": "git",

packages/DEBIAN/changelog

+vufind 4.1.1 distribution; urgency=low
+
+  * VuFind 4.1.1 release (see http://vufind.org/wiki/changelog for details)
+
+ -- maintainer VuFind Project Administration Team <vufind-admins@lists.sourceforge.net>  Mo 20 Nov 2017 08:48:29 UTC
+
 vufind 4.1 distribution; urgency=low
 
   * VuFind 4.1 release (see http://vufind.org/wiki/changelog for details)

packages/DEBIAN/control

 Package: vufind
-Version: 4.1
+Version: 4.1.1
 Section: World Wide Web
 Priority: Optional
 Architecture: all

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'] ?>">