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.1" />
+  <property name="version" value="4.1.2" />
 
   <!-- We only need the -p switch if the password is non-blank -->
   <if><not><equals arg1="${mysqlrootpass}" arg2="" /></not><then>

config/vufind/config.ini

@@ -135,7 +135,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.1"
+generator = "VuFind 4.1.2"
 
 ; This section allows you to configure the mechanism used for storing user
 ; sessions.  Available types: File, Memcache, Database.

module/VuFind/src/VuFind/Cover/Loader.php

@@ -600,7 +600,7 @@ class Loader extends \VuFind\ImageLoader
             // Attempt to pull down the image:
             $result = $this->client->setUri($url)->send();
             if (!$result->isSuccess()) {
-                $this->debug("Failed to retrieve image from " + $url);
+                $this->debug('Failed to retrieve image from ' . $url);
                 return false;
             }
             $image = $result->getBody();

package.json

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

packages/DEBIAN/changelog

+vufind 4.1.2 distribution; urgency=low
+
+  * VuFind 4.1.2 release (see http://vufind.org/wiki/changelog for details)
+
+ -- maintainer VuFind Project Administration Team <vufind-admins@lists.sourceforge.net>  Mo 29 Jan 2018 07:56:21 UTC
+
 vufind 4.1.1 distribution; urgency=low
 
   * VuFind 4.1.1 release (see http://vufind.org/wiki/changelog for details)

packages/DEBIAN/control

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