diff --git a/module/VuFind/src/VuFind/Bootstrapper.php b/module/VuFind/src/VuFind/Bootstrapper.php index a6ea0ffae8ee39615ec8de16402798aa58b28920..04447ec5084eb36568488b8f054a24832a9646e6 100644 --- a/module/VuFind/src/VuFind/Bootstrapper.php +++ b/module/VuFind/src/VuFind/Bootstrapper.php @@ -203,7 +203,8 @@ class Bootstrapper // the config file if this doesn't work -- different systems may vary in // their behavior here. setlocale( - LC_ALL, [ + LC_ALL, + [ "{$this->config->Site->locale}.UTF8", "{$this->config->Site->locale}.UTF-8", $this->config->Site->locale diff --git a/module/VuFind/src/VuFind/Controller/BrowseController.php b/module/VuFind/src/VuFind/Controller/BrowseController.php index 3bc9b8f08a311a82a6f49a8eb9a2014359ac7a01..0acfb2e17819e1354d43de7203f6b8fd6fd0168d 100644 --- a/module/VuFind/src/VuFind/Controller/BrowseController.php +++ b/module/VuFind/src/VuFind/Controller/BrowseController.php @@ -538,40 +538,40 @@ class BrowseController extends AbstractBase return ['', $this->getAlphabetList()]; case 'dewey': return [ - 'dewey-tens', $this->quoteValues( - $this->getFacetList('dewey-hundreds', $category, 'index') - ) - ]; + 'dewey-tens', $this->quoteValues( + $this->getFacetList('dewey-hundreds', $category, 'index') + ) + ]; case 'lcc': return [ - 'callnumber-first', $this->quoteValues( - $this->getFacetList('callnumber-first', $category, 'index') - ) - ]; + 'callnumber-first', $this->quoteValues( + $this->getFacetList('callnumber-first', $category, 'index') + ) + ]; case 'topic': return [ - 'topic_facet', $this->quoteValues( - $this->getFacetList('topic_facet', $category) - ) - ]; + 'topic_facet', $this->quoteValues( + $this->getFacetList('topic_facet', $category) + ) + ]; case 'genre': return [ - 'genre_facet', $this->quoteValues( - $this->getFacetList('genre_facet', $category) - ) - ]; + 'genre_facet', $this->quoteValues( + $this->getFacetList('genre_facet', $category) + ) + ]; case 'region': return [ - 'geographic_facet', $this->quoteValues( - $this->getFacetList('geographic_facet', $category) - ) - ]; + 'geographic_facet', $this->quoteValues( + $this->getFacetList('geographic_facet', $category) + ) + ]; case 'era': return [ - 'era_facet', $this->quoteValues( - $this->getFacetList('era_facet', $category) - ) - ]; + 'era_facet', $this->quoteValues( + $this->getFacetList('era_facet', $category) + ) + ]; } } diff --git a/module/VuFind/src/VuFind/Controller/SearchController.php b/module/VuFind/src/VuFind/Controller/SearchController.php index b06c7e07b9bf5dae1a714711ac52577210dfa9a6..3518500307e128a84ab8bea04f6d0b12df682824 100644 --- a/module/VuFind/src/VuFind/Controller/SearchController.php +++ b/module/VuFind/src/VuFind/Controller/SearchController.php @@ -88,7 +88,8 @@ class SearchController extends AbstractSearch $view->useRecaptcha = $this->recaptcha()->active('email'); $view->url = $this->params()->fromPost( 'url', $this->params()->fromQuery( - 'url', $this->getRequest()->getServer()->get('HTTP_REFERER') + 'url', + $this->getRequest()->getServer()->get('HTTP_REFERER') ) ); diff --git a/module/VuFind/src/VuFind/ILS/Driver/Aleph.php b/module/VuFind/src/VuFind/ILS/Driver/Aleph.php index ff6c41cb4a941f7ef5a2a03f26ed2368e92d1272..2c8bfa05e8d021ee808ec025a9a560bfaecf21a8 100644 --- a/module/VuFind/src/VuFind/ILS/Driver/Aleph.php +++ b/module/VuFind/src/VuFind/ILS/Driver/Aleph.php @@ -443,7 +443,8 @@ class Aleph extends AbstractBase implements \Zend\Log\LoggerAwareInterface, $url = $this->appendQueryString($url, $params); if ($auth) { $url = $this->appendQueryString( - $url, [ + $url, + [ 'user_name' => $this->wwwuser, 'user_password' => $this->wwwpasswd ]