From f7c6e9f586667ea5dfdd5dd08a05ccb799e1d424 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 9 Dec 2015 17:00:10 +0000
Subject: [PATCH] Bug 15344: Remove unucessary call to GetMemberDetails
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This subroutine does a lot a processing and should only be called when
necessary.
In the get_template_and_user subroutine (so called from any pages of
Koha), it is call to pass the branchcode, title, firstname, surname and
borrowernumber values for the logged in user.
This subroutine calls GetMemberAccountRecords which retrieve the items
infos for all accountlines entries of the logged in user.
On members/members.pl, let's say you have 74 entries in the accountlines
tables, the page will execute 115 SELECT instead of 35 if you don't have any
accountlines entries.
With this patch, the number of SELECT is always 31.

To test this patch you should have technical skills to know what to do.

Note that USER_INFO was an array of... 1 element. Now it's a hashref.

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ac541e0fa1c11254e110d94eed64c358e02e8aab)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 44202df6acdfcfb371eccc6b8e8007a871304e49)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 C4/Auth.pm                                    |   10 +-
 admin/aqbudgets.pl                            |    2 +-
 admin/aqplan.pl                               |    6 +-
 .../prog/en/includes/cateditor-ui.inc         | 1104 +++++++++++++++++
 .../bootstrap/en/includes/masthead.inc        |    2 +-
 .../en/modules/opac-downloadshelf.tt          |    2 +-
 .../bootstrap/en/modules/opac-reserve.tt      |    6 +-
 .../bootstrap/en/modules/opac-shareshelf.tt   |    2 +-
 .../bootstrap/en/modules/opac-shelves.tt      |    2 +-
 .../bootstrap/en/modules/opac-suggestions.tt  |    2 +-
 10 files changed, 1119 insertions(+), 19 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc

diff --git a/C4/Auth.pm b/C4/Auth.pm
index d413db6df0..2c59bd58a6 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -208,9 +208,10 @@ sub get_template_and_user {
         # It's possible for $user to be the borrowernumber if they don't have a
         # userid defined (and are logging in through some other method, such
         # as SSL certs against an email address)
+        my $borrower;
         $borrowernumber = getborrowernumber($user) if defined($user);
         if ( !defined($borrowernumber) && defined($user) ) {
-            my $borrower = C4::Members::GetMember( borrowernumber => $user );
+            $borrower = C4::Members::GetMember( borrowernumber => $user );
             if ($borrower) {
                 $borrowernumber = $user;
 
@@ -218,6 +219,8 @@ sub get_template_and_user {
                 # to do it.
                 $user = $borrower->{firstname} . ' ' . $borrower->{surname};
             }
+        } else {
+            $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
         }
 
         # user info
@@ -236,10 +239,7 @@ sub get_template_and_user {
             );
         }
 
-        my ($borr) = C4::Members::GetMemberDetails($borrowernumber);
-        my @bordat;
-        $bordat[0] = $borr;
-        $template->param( "USER_INFO" => \@bordat );
+        $template->param( "USER_INFO" => $borrower );
 
         my $all_perms = get_all_subpermissions();
 
diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index 45403911db..03a8c33c63 100755
--- a/admin/aqbudgets.pl
+++ b/admin/aqbudgets.pl
@@ -89,7 +89,7 @@ if ( $budget_period_id ) {
 # ------- get periods stuff ------------------
 
 # USED FOR PERMISSION COMPARISON LATER
-my $borrower_id         = $template->{VARS}->{'USER_INFO'}[0]->{'borrowernumber'};
+my $borrower_id         = $template->{VARS}->{'USER_INFO'}->{'borrowernumber'};
 my $user                = GetMemberDetails($borrower_id);
 my $user_branchcode     = $user->{'branchcode'};
 
diff --git a/admin/aqplan.pl b/admin/aqplan.pl
index 47b4b8c3e7..635f53460e 100755
--- a/admin/aqplan.pl
+++ b/admin/aqplan.pl
@@ -84,8 +84,8 @@ $template->param(
 
 # ------- get periods stuff ------------------
 
-my $borrower_id         = $template->{VARS}->{'USER_INFO'}[0]->{'borrowernumber'};
-my $borrower_branchcode = $template->{VARS}->{'USER_INFO'}[0]->{'branchcode'};
+my $borrower_id         = $template->{VARS}->{'USER_INFO'}->{'borrowernumber'};
+my $borrower_branchcode = $template->{VARS}->{'USER_INFO'}->{'branchcode'};
 
 my $periods;
 my $authcat      = $input->param('authcat');
@@ -111,7 +111,7 @@ my $op        = $input->param("op");
 
 my $budget_branchcode;
 
-my $budgets_ref = GetBudgetHierarchy( $budget_period_id, $show_mine?$template->{VARS}->{'USER_INFO'}[0]->{'branchcode'}:'', $show_mine?$template->{VARS}->{'USER_INFO'}[0]->{'borrowernumber'}:'' );
+my $budgets_ref = GetBudgetHierarchy( $budget_period_id, $show_mine?$template->{VARS}->{'USER_INFO'}->{'branchcode'}:'', $show_mine?$template->{VARS}->{'USER_INFO'}->{'borrowernumber'}:'' );
 
 # build categories list
 my $sth = $dbh->prepare("select distinct category from authorised_values where category like 'A%' ");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
new file mode 100644
index 0000000000..87f5360c53
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
@@ -0,0 +1,1104 @@
+<script src="[% interface %]/lib/codemirror/codemirror-compressed.js"></script>
+<script src="[% interface %]/lib/filesaver.js"></script>
+<script src="[% interface %]/lib/koha/cateditor/marc-mode.js"></script>
+<script src="[% interface %]/lib/require.js"></script>
+<script>
+require.config( {
+    baseUrl: '[% interface %]/lib/koha/cateditor/',
+    config: {
+        resources: {
+            marcflavour: '[% marcflavour %]',
+            themelang: '[% themelang %]',
+        },
+    },
+    waitSeconds: 30,
+} );
+</script>
+
+[% IF marcflavour == 'MARC21' %]
+[% PROCESS 'cateditor-widgets-marc21.inc' %]
+[% ELSE %]
+<script>var editorWidgets = {};</script>
+[% END %]
+
+<script>
+require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'preferences', 'resources', 'text-marc', 'widget' ], function( KohaBackend, Search, Macros, MARCEditor, MARC, Preferences, Resources, TextMARC, Widget ) {
+    var z3950Servers = {
+        'koha:biblioserver': {
+            name: _("Local catalog"),
+            recordtype: 'biblio',
+            checked: false,
+        },
+        [%- FOREACH server = z3950_servers -%]
+            [% server.id %]: {
+                name: '[% server.servername %]',
+                recordtype: '[% server.recordtype %]',
+                checked: [% server.checked ? 'true' : 'false' %],
+            },
+        [%- END -%]
+    };
+
+    // The columns that should show up in a search, in order, and keyed by the corresponding <metadata> tag in the XSL and Pazpar2 config
+    var z3950Labels = [
+        [ "local_number", _("Local number") ],
+        [ "title", _("Title") ],
+        [ "series", _("Series title") ],
+        [ "author", _("Author") ],
+        [ "lccn", _("LCCN") ],
+        [ "isbn", _("ISBN") ],
+        [ "issn", _("ISSN") ],
+        [ "medium", _("Medium") ],
+        [ "edition", _("Edition") ],
+        [ "notes", _("Notes") ],
+    ];
+
+    var state = {
+        backend: '',
+        saveBackend: 'catalog',
+        recordID: undefined
+    };
+
+    var editor;
+    var macroEditor;
+
+    function makeAuthorisedValueWidgets( frameworkCode ) {
+        $.each( KohaBackend.GetAllTagsInfo( frameworkCode ), function( tag, tagInfo ) {
+            $.each( tagInfo.subfields, function( subfield, subfieldInfo ) {
+                if ( !subfieldInfo.authorised_value ) return;
+                var authvals = KohaBackend.GetAuthorisedValues( subfieldInfo.authorised_value );
+                if ( !authvals ) return;
+
+                var defaultvalue = subfield.defaultvalue || authvals[0].value;
+
+                Widget.Register( tag + subfield, {
+                    init: function() {
+                        var $result = $( '<span class="subfield-widget"></span>' );
+
+                        return $result[0];
+                    },
+                    postCreate: function() {
+                        this.setText( defaultvalue );
+
+                        $( '<select></select>' ).appendTo( this.node );
+                        var $node = $( this.node ).find( 'select' );
+                        $.each( authvals, function( undef, authval ) {
+                            $node.append( '<option value="' + authval.value + '"' + (authval.value == defaultvalue ? ' selected="selected"' : '') + '>' + authval.lib + '</option>' );
+                        } );
+                        $node.val( this.text );
+
+                        $node.change( $.proxy( function() {
+                            this.setText( $node.val() );
+                        }, this ) );
+                    },
+                    makeTemplate: function() {
+                        return defaultvalue;
+                    },
+                } );
+            } );
+        } );
+    }
+
+    function bindGlobalKeys() {
+        shortcut.add( 'ctrl+s', function(event) {
+            $( '#save-record' ).click();
+
+            event.preventDefault();
+        } );
+
+        shortcut.add( 'alt+ctrl+k', function(event) {
+            $( '#search-by-keywords' ).focus();
+
+            return false;
+        } );
+
+        shortcut.add( 'alt+ctrl+a', function(event) {
+            $( '#search-by-author' ).focus();
+
+            return false;
+        } );
+
+        shortcut.add( 'alt+ctrl+i', function(event) {
+            $( '#search-by-isbn' ).focus();
+
+            return false;
+        } );
+
+        shortcut.add( 'alt+ctrl+t', function(event) {
+            $( '#search-by-title' ).focus();
+
+            return false;
+        } );
+
+        shortcut.add( 'ctrl+h', function() {
+            var field = editor.getCurrentField();
+
+            if ( !field ) return;
+
+            window.open( getFieldHelpURL( field.tag ) );
+        } );
+
+        $('#quicksearch .search-box').each( function() {
+            shortcut.add( 'enter', $.proxy( function() {
+                var terms = [];
+
+                $('#quicksearch .search-box').each( function() {
+                    if ( !this.value ) return;
+
+                    terms.push( [ $(this).data('qualifier'), this.value ] );
+                } );
+
+                if ( !terms.length ) return;
+
+                if ( Search.Run( z3950Servers, Search.JoinTerms(terms) ) ) {
+                    $("#search-overlay").show();
+                    showResultsBox();
+                }
+
+                return false;
+            }, this), { target: this, type: 'keypress' } );
+        } );
+    }
+
+    function getFieldHelpURL( tag ) {
+        [% IF ( marcflavour == 'MARC21' ) %]
+            if ( tag == '000' ) {
+                return "http://www.loc.gov/marc/bibliographic/bdleader.html";
+            } else if ( tag < '900' ) {
+                return "http://www.loc.gov/marc/bibliographic/bd" + tag + ".html";
+            } else {
+                return "http://www.loc.gov/marc/bibliographic/bd9xx.html";
+            }
+        [% ELSIF ( marcflavour == 'UNIMARC' ) %]
+            /* http://archive.ifla.org/VI/3/p1996-1/ is an outdated version of UNIMARC, but
+               seems to be the only version available that can be linked to per tag.  More recent
+               versions of the UNIMARC standard are available on the IFLA website only as
+               PDFs!
+            */
+            if ( tag == '000' ) {
+               return  "http://archive.ifla.org/VI/3/p1996-1/uni.htm";
+            } else {
+                var first = tag[0];
+                var url = "http://archive.ifla.org/VI/3/p1996-1/uni" + first + ".htm#";
+                if ( first == '0' ) url += "b";
+                if ( first != '9' ) url += tag;
+
+                return url;
+            }
+        [% END %]
+    }
+
+    // Record loading
+    var backends = {
+       'new': {
+            titleForRecord: _("Editing new record"),
+            get: function( id, callback ) {
+                record = new MARC.Record();
+                KohaBackend.FillRecord( '', record );
+
+                callback( record );
+            },
+        },
+        'new-full': {
+            titleForRecord: _("Editing new full record"),
+            get: function( id, callback ) {
+                record = new MARC.Record();
+                KohaBackend.FillRecord( '', record, true );
+
+                callback( record );
+            },
+        },
+        'catalog': {
+            titleForRecord: _("Editing catalog record #{ID}"),
+            links: [
+                { title: _("view"), href: "/cgi-bin/koha/catalogue/detail.pl?biblionumber={ID}" },
+                { title: _("edit items"), href: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber={ID}" },
+            ],
+            saveLabel: _("Save to catalog"),
+            get: function( id, callback ) {
+                if ( !id ) return false;
+
+                KohaBackend.GetRecord( id, callback );
+            },
+            save: function( id, record, done ) {
+                function finishCb( data ) {
+                    done( { error: data.error, newRecord: data.marcxml && data.marcxml[0], newId: data.biblionumber && [ 'catalog', data.biblionumber ] } );
+                }
+
+                if ( id ) {
+                    KohaBackend.SaveRecord( id, record, finishCb );
+                } else {
+                    KohaBackend.CreateRecord( record, finishCb );
+                }
+            }
+        },
+        'iso2709': {
+            saveLabel: _("Save as ISO2709 (.mrc) file"),
+            save: function( id, record, done ) {
+                saveAs( new Blob( [record.toISO2709()], { 'type': 'application/octet-stream;charset=utf-8' } ), 'record.mrc' );
+
+                done( {} );
+            }
+        },
+        'marcxml': {
+            saveLabel: _("Save as MARCXML (.xml) file"),
+            save: function( id, record, done ) {
+                saveAs( new Blob( [record.toXML()], { 'type': 'application/octet-stream;charset=utf-8' } ), 'record.xml' );
+
+                done( {} );
+            }
+        },
+        'search': {
+            titleForRecord: _("Editing search result"),
+            get: function( id, callback ) {
+                if ( !id ) return false;
+                if ( !backends.search.records[ id ] ) {
+                    callback( { error: _( "Invalid record" ) } );
+                    return false;
+                }
+
+                callback( backends.search.records[ id ] );
+            },
+            records: {},
+        },
+    };
+
+    function setSource(parts) {
+        state.backend = parts[0];
+        state.recordID = parts[1];
+        state.canSave = backends[ state.backend ].save != null;
+        state.saveBackend = state.canSave ? state.backend : 'catalog';
+
+        var backend = backends[state.backend];
+
+        document.location.hash = '#' + parts[0] + '/' + parts[1];
+
+        $('#title').text( backend.titleForRecord.replace( '{ID}', parts[1] ) );
+
+        $.each( backend.links || [], function( i, link ) {
+            $('#title').append(' <a target="_blank" href="' + link.href.replace( '{ID}', parts[1] ) + '">(' + link.title + ')</a>' );
+        } );
+        $( 'title', document.head ).html( _("Koha &rsaquo; Cataloging &rsaquo; ") + backend.titleForRecord.replace( '{ID}', parts[1] ) );
+        $('#save-record span').text( backends[ state.saveBackend ].saveLabel );
+    }
+
+    function saveRecord( recid, editor, callback ) {
+        var parts = recid.split('/');
+        if ( parts.length != 2 ) return false;
+
+        if ( !backends[ parts[0] ] || !backends[ parts[0] ].save ) return false;
+
+        editor.removeErrors();
+        var record = editor.getRecord();
+
+        if ( record.errors ) {
+            state.saving = false;
+            callback( { error: 'syntax', errors: record.errors } );
+            return;
+        }
+
+        var errors = KohaBackend.ValidateRecord( '', record );
+        if ( errors.length ) {
+            state.saving = false;
+            callback( { error: 'invalid', errors: errors } );
+            return;
+        }
+
+        backends[ parts[0] ].save( parts[1], record, function(data) {
+            state.saving = false;
+
+            if (data.newRecord) {
+                var record = new MARC.Record();
+                record.loadMARCXML(data.newRecord);
+                editor.displayRecord( record );
+            }
+
+            if (data.newId) {
+                setSource(data.newId);
+            } else {
+                setSource( [ state.backend, state.recordID ] );
+            }
+
+            if (callback) callback( data );
+        } );
+    }
+
+    function loadRecord( recid, editor, callback ) {
+        var parts = recid.split('/');
+        if ( parts.length != 2 ) return false;
+
+        if ( !backends[ parts[0] ] || !backends[ parts[0] ].get ) return false;
+
+        backends[ parts[0] ].get( parts[1], function( record ) {
+            if ( !record.error ) {
+                editor.displayRecord( record );
+                editor.focus();
+            }
+
+            if (callback) callback(record);
+        } );
+
+        return true;
+    }
+
+    function openRecord( recid, editor, callback ) {
+        return loadRecord( recid, editor, function ( record ) {
+            setSource( recid.split('/') );
+
+            if (callback) callback( record );
+        } );
+    }
+
+    // Search functions
+    function showAdvancedSearch() {
+        $('#advanced-search-servers').empty();
+        $.each( z3950Servers, function( server_id, server ) {
+            $('#advanced-search-servers').append( '<li data-server-id="' + server_id + '"><label><input class="search-toggle-server" type="checkbox"' + ( server.checked ? ' checked="checked">' : '>' ) + server.name + '</label></li>' );
+        } );
+        $('#advanced-search-ui').modal('show');
+    }
+
+    function startAdvancedSearch() {
+        var terms = [];
+
+        $('#advanced-search-ui .search-box').each( function() {
+            if ( !this.value ) return;
+
+            terms.push( [ $(this).data('qualifier'), this.value ] );
+        } );
+
+        if ( !terms.length ) return;
+
+        if ( Search.Run( z3950Servers, Search.JoinTerms(terms) ) ) {
+            $('#advanced-search-ui').modal('hide');
+            $("#search-overlay").show();
+            showResultsBox();
+        }
+    }
+
+    function showResultsBox(data) {
+        $('#search-top-pages, #search-bottom-pages').find('.pagination').empty();
+        $('#searchresults thead tr').empty();
+        $('#searchresults tbody').empty();
+        $('#search-serversinfo').empty().append('<li>' + _("Loading...") + '</li>');
+        $('#search-results-ui').modal('show');
+    }
+
+    function showSearchSorting( sort_key, sort_direction ) {
+        var $th = $('#searchresults thead tr th[data-sort-label="' + sort_key + '"]');
+        $th.parent().find( 'th[data-sort-label]' ).attr( 'class', 'sorting' );
+
+        if ( sort_direction == 'asc' ) {
+            direction = 'asc';
+            $th.attr( 'class', 'sorting_asc' );
+        } else {
+            direction = 'desc';
+            $th.attr( 'class', 'sorting_desc' );
+        }
+    }
+
+    function showSearchResults( editor, data ) {
+        backends.search.records = {};
+
+        $('#searchresults thead tr').empty();
+        $('#searchresults tbody').empty();
+        $('#search-serversinfo').empty();
+
+        $.each( z3950Servers, function( server_id, server ) {
+            var num_fetched = data.num_fetched[server_id];
+
+            if ( data.errors[server_id] ) {
+                num_fetched = data.errors[server_id];
+            } else if ( num_fetched == null ) {
+                num_fetched = '-';
+            } else if ( num_fetched < data.num_hits[server_id] ) {
+                num_fetched += '+';
+            }
+
+            $('#search-serversinfo').append( '<li data-server-id="' + server_id + '"><label><input class="search-toggle-server" type="checkbox"' + ( server.checked ? ' checked="checked">' : '>' ) + server.name + ' (' + num_fetched + ')' + '</label></li>' );
+        } );
+
+        var seenColumns = {};
+
+        $.each( data.hits, function( undef, hit ) {
+            $.each( hit.metadata, function(key) {
+                seenColumns[key] = true;
+            } );
+        } );
+
+        $('#searchresults thead tr').append('<th>' + _("Source") + '</th>');
+
+        $.each( z3950Labels, function( undef, label ) {
+            if ( seenColumns[ label[0] ] ) {
+                $('#searchresults thead tr').append( '<th class="sorting" data-sort-label="' + label[0] + '">' + label[1] + '</th>' );
+            }
+        } );
+
+        showSearchSorting( data.sort_key, data.sort_direction );
+
+        $('#searchresults thead tr').append('<th>' + _("Tools") + '</th>');
+
+        var bibnumMap = KohaBackend.GetSubfieldForKohaField('biblio.biblionumber');
+        $.each( data.hits, function( undef, hit ) {
+            backends.search.records[ hit.server + ':' + hit.index ] = hit.record;
+
+            switch ( hit.server ) {
+                case 'koha:biblioserver':
+                    var bibnumField = hit.record.field( bibnumMap[0] );
+
+                    if ( bibnumField && bibnumField.hasSubfield( bibnumMap[1] ) ) {
+                        hit.id = 'catalog/' + bibnumField.subfield( bibnumMap[1] );
+                        break;
+                    }
+
+                    // Otherwise, fallthrough
+
+                default:
+                    hit.id = 'search/' + hit.server + ':' + hit.index;
+            }
+
+            var result = '<tr>';
+            result += '<td class="sourcecol">' + z3950Servers[ hit.server ].name + '</td>';
+
+            $.each( z3950Labels, function( undef, label ) {
+                if ( !seenColumns[ label[0] ] ) return;
+
+                if ( hit.metadata[ label[0] ] ) {
+                    result += '<td class="infocol">' + hit.metadata[ label[0] ] + '</td>';
+                } else {
+                    result += '<td class="infocol">&nbsp;</td>';
+                }
+            } );
+
+            result += '<td class="toolscol"><ul><li><a href="#" class="marc-link">' + _("View MARC") + '</a></li>';
+            result += '<li><a href="#" class="open-link">' + ( hit.server == 'koha:biblioserver' ? _("Edit") : _("Import") ) + '</a></li>';
+            if ( state.canSave ) result += '<li><a href="#" class="substitute-link" title="' + _("Replace the current record's contents") + '">' + _("Substitute") + '</a></li>';
+            result += '</ul></td></tr>';
+
+            var $tr = $( result );
+            $tr.find( '.marc-link' ).click( function() {
+                var $info_columns = $tr.find( '.infocol' );
+                var $marc_column = $tr.find( '.marccol' );
+
+                if ( !$marc_column.length ) {
+                    $marc_column = $( '<td class="marccol" colspan="' + $info_columns.length + '"></td>' ).insertAfter( $info_columns.eq(-1) ).hide();
+                    CodeMirror.runMode( TextMARC.RecordToText( hit.record ), 'marc', $marc_column[0] );
+                }
+
+                if ( $marc_column.is(':visible') ) {
+                    $tr.find('.marc-link').text( _("View MARC") );
+                    $info_columns.show();
+                    $marc_column.hide();
+                } else {
+                    $tr.find('.marc-link').text( _("Hide MARC") );
+                    $marc_column.show();
+                    $info_columns.hide();
+                }
+
+                return false;
+            } );
+            $tr.find( '.open-link' ).click( function() {
+                $( '#search-results-ui' ).modal('hide');
+                openRecord( hit.id, editor );
+
+                return false;
+            } );
+            $tr.find( '.substitute-link' ).click( function() {
+                $( '#search-results-ui' ).modal('hide');
+                loadRecord( hit.id, editor );
+
+                return false;
+            } );
+            $('#searchresults tbody').append( $tr );
+        } );
+
+        var pages = [];
+        var cur_page = data.offset / data.page_size;
+        var max_page = Math.ceil( data.total_fetched / data.page_size ) - 1;
+
+        if ( cur_page != 0 ) {
+            pages.push( '<li><a class="search-nav" href="#" data-offset="' + (data.offset - data.page_size) + '">&laquo; ' + _("Previous") + '</a></li>' );
+        }
+
+        for ( var page = Math.max( 0, cur_page - 9 ); page <= Math.min( max_page, cur_page + 9 ); page++ ) {
+            if ( page == cur_page ) {
+                pages.push( ' <li class="active"><a href="#">' + ( page + 1 ) + '</a></li>' );
+            } else {
+                pages.push( ' <li><a class="search-nav" href="#" data-offset="' + ( page * data.page_size ) + '">' + ( page + 1 ) + '</a></li>' );
+            }
+        }
+
+        if ( cur_page < max_page ) {
+            pages.push( ' <li><a class="search-nav" href="#" data-offset="' + (data.offset + data.page_size) + '">' + _("Next") + ' &raquo;</a></li>' );
+        }
+
+        $( '#search-top-pages, #search-bottom-pages' ).find( '.pagination' ).html( pages.length > 1 ? ( '<ul>' + pages.join( '' ) + '</ul>' ) : '' );
+
+        var $overlay = $('#search-overlay');
+        $overlay.find('span').text(_("Loading"));
+        $overlay.find('.bar').css( { display: 'block', width: 100 * ( 1 - data.activeclients / Search.includedServers.length ) + '%' } );
+
+        if ( data.activeclients ) {
+            $overlay.find('.bar').css( { display: 'block', width: 100 * ( 1 - data.activeclients / Search.includedServers.length ) + '%' } );
+            $overlay.show();
+        } else {
+            $overlay.find('.bar').css( { display: 'block', width: '100%' } );
+            $overlay.fadeOut();
+            $('#searchresults')[0].focus();
+        }
+    }
+
+    function invalidateSearchResults() {
+        var $overlay = $('#search-overlay');
+        $overlay.find('span').text(_("Search expired, please try again"));
+        $overlay.find('.bar').css( { display: 'none' } );
+        $overlay.show();
+    }
+
+    function handleSearchError(error) {
+        if (error.code == 1) {
+            invalidateSearchResults();
+            Search.Reconnect();
+        } else {
+            humanMsg.displayMsg( '<h3>' + _("Internal search error") + '</h3><p>' + error + '</p><p>' + _("Please refresh the page and try again.") + '</p>', { className: 'humanError' } );
+        }
+    }
+
+    function handleSearchInitError(error) {
+        $('#quicksearch-overlay').fadeIn().find('p').text(error);
+    }
+
+    // Preference functions
+    function showPreference( pref ) {
+        var value = Preferences.user[pref];
+
+        switch (pref) {
+            case 'fieldWidgets':
+                $( '#set-field-widgets' ).text( value ? _("Show fields verbatim") : _("Show helpers for fixed and coded fields") );
+                break;
+            case 'font':
+                $( '#editor .CodeMirror' ).css( { fontFamily: value } );
+                editor.refresh();
+                break;
+            case 'fontSize':
+                $( '#editor .CodeMirror' ).css( { fontSize: value } );
+                editor.refresh();
+                break;
+            case 'macros':
+                // Macros loaded on first show of modal
+                break;
+            case 'selected_search_targets':
+                $.each( z3950Servers, function( server_id, server ) {
+                    var saved_val = Preferences.user.selected_search_targets[server_id];
+
+                    if ( saved_val != null ) server.checked = saved_val;
+                } );
+                break;
+        }
+    }
+
+    function bindPreference( editor, pref ) {
+        function _addHandler( sel, event, handler ) {
+            $( sel ).on( event, function (e) {
+                e.preventDefault();
+                handler( e, Preferences.user[pref] );
+                Preferences.Save( [% USER_INFO.borrowernumber %] );
+                showPreference(pref);
+            } );
+        }
+
+        switch (pref) {
+            case 'fieldWidgets':
+                _addHandler( '#set-field-widgets', 'click', function( e, oldValue ) {
+                    editor.setUseWidgets( Preferences.user.fieldWidgets = !Preferences.user.fieldWidgets );
+                } );
+                break;
+            case 'font':
+                _addHandler( '#prefs-menu .set-font', 'click', function( e, oldValue ) {
+                    Preferences.user.font = $( e.target ).css( 'font-family' );
+                } );
+                break;
+            case 'fontSize':
+                _addHandler( '#prefs-menu .set-fontSize', 'click', function( e, oldValue ) {
+                    Preferences.user.fontSize = $( e.target ).css( 'font-size' );
+                } );
+                break;
+            case 'selected_search_targets':
+                $( document ).on( 'change', 'input.search-toggle-server', function() {
+                    var server_id = $( this ).closest('li').data('server-id');
+                    Preferences.user.selected_search_targets[server_id] = this.checked;
+                    Preferences.Save( [% USER_INFO.borrowernumber %] );
+                } );
+                break;
+        }
+    }
+
+    function displayPreferences( editor ) {
+        $.each( Preferences.user, function( pref, value ) {
+            showPreference( pref );
+            bindPreference( editor, pref );
+        } );
+    }
+
+    //> Macro functions
+    function loadMacro( name ) {
+        $( '#macro-list li' ).removeClass( 'active' );
+        macroEditor.activeMacro = name;
+
+        if ( !name ) {
+            macroEditor.setValue( '' );
+            return;
+        }
+
+        $( '#macro-list li[data-name="' + name + '"]' ).addClass( 'active' );
+        var macro = Preferences.user.macros[name];
+        macroEditor.setValue( macro.contents );
+        macroEditor.setOption( 'readOnly', false );
+        $( '#macro-format' ).val( macro.format || 'its' );
+        if ( macro.history ) macroEditor.setHistory( macro.history );
+    }
+
+    function storeMacro( name, macro ) {
+        if ( macro ) {
+            Preferences.user.macros[name] = macro;
+        } else {
+            delete Preferences.user.macros[name];
+        }
+
+        Preferences.Save( [% USER_INFO.borrowernumber %] );
+    }
+
+    function showSavedMacros( macros ) {
+        var scrollTop = $('#macro-list').scrollTop();
+        $( '#macro-list' ).empty();
+        var macro_list = $.map( Preferences.user.macros, function( macro, name ) {
+            return $.extend( { name: name }, macro );
+        } );
+        macro_list.sort( function( a, b ) {
+            return a.name.localeCompare(b.name);
+        } );
+        $.each( macro_list, function( undef, macro ) {
+            var $li = $( '<li data-name="' + macro.name + '"><a href="#">' + macro.name + '</a><ol class="macro-info"></ol></li>' );
+            $li.click( function() {
+                loadMacro(macro.name);
+                return false;
+            } );
+            if ( macro.name == macroEditor.activeMacro ) $li.addClass( 'active' );
+            var modified = macro.modified && new Date(macro.modified);
+            $li.find( '.macro-info' ).append(
+                '<li><span class="label">' + _("Last changed:") + '</span>' +
+                ( modified ? ( modified.toLocaleDateString() + ', ' + modified.toLocaleTimeString() ) : _("never") ) + '</li>'
+            );
+            $('#macro-list').append($li);
+        } );
+        var $new_li = $( '<li class="new-macro"><a href="#">' + _("New macro...") + '</a></li>' );
+        $new_li.click( function() {
+            // TODO: make this a bit less retro
+            var name = prompt(_("Please enter the name for the new macro:"));
+            if (!name) return;
+
+            if ( !Preferences.user.macros[name] ) storeMacro( name, { format: "rancor", contents: "" } );
+            showSavedMacros();
+            loadMacro( name );
+        } );
+        $('#macro-list').append($new_li);
+        $('#macro-list').scrollTop(scrollTop);
+    }
+
+    function saveMacro() {
+        var name = macroEditor.activeMacro;
+
+        if ( !name || macroEditor.savedGeneration == macroEditor.changeGeneration() ) return;
+
+        macroEditor.savedGeneration = macroEditor.changeGeneration();
+        storeMacro( name, { contents: macroEditor.getValue(), modified: (new Date()).valueOf(), history: macroEditor.getHistory(), format: $('#macro-format').val() } );
+        $('#macro-save-message').text(_("Saved"));
+        showSavedMacros();
+    }
+
+    $(document).ready( function() {
+        // Editor setup
+        editor = new MARCEditor( {
+            onCursorActivity: function() {
+                $('#status-tag-info').empty();
+                $('#status-subfield-info').empty();
+
+                var field = editor.getCurrentField();
+                var cur = editor.getCursor();
+
+                if ( !field ) return;
+
+                var taginfo = KohaBackend.GetTagInfo( '', field.tag );
+                $('#status-tag-info').html( '<strong>' + field.tag + ':</strong> ' );
+
+                if ( taginfo ) {
+                    $('#status-tag-info').append( '<a href="' + getFieldHelpURL( field.tag ) + '" target="_blank" class="show-field-help" title="' + _("Show help for this tag") + '">[?]</a> '  + taginfo.lib );
+
+                    var subfield = field.getSubfieldAt( cur.ch );
+                    if ( !subfield ) return;
+
+                    var subfieldinfo = taginfo.subfields[ subfield.code ];
+                    $('#status-subfield-info').html( '<strong>‡' + subfield.code + ':</strong> ' );
+
+                    if ( subfieldinfo ) {
+                        $('#status-subfield-info').append( subfieldinfo.lib );
+                    } else {
+                        $('#status-subfield-info').append( '<em>' + _("Unknown subfield") + '</em>' );
+                    }
+                } else {
+                    $('#status-tag-info').append( '<em>' + _("Unknown tag") + '</em>' );
+                }
+            },
+            position: function (elt) { $(elt).insertAfter('#toolbar') },
+        } );
+
+        // Automatically detect resizes and change the height of the editor and position of modals.
+        var resizeTimer = null;
+        function onResize() {
+            if ( resizeTimer == null ) resizeTimer = setTimeout( function() {
+                resizeTimer = null;
+
+                var pos = $('#editor .CodeMirror').position();
+                $('#editor .CodeMirror').height( $(window).height() - pos.top - 24 - $('#changelanguage').height() ); // 24 is hardcoded value but works well
+
+                $('.modal-body').each( function() {
+                    $(this).height( $(window).height() * .8 - $(this).prevAll('.modal-header').height() );
+                } );
+            }, 100);
+
+            $("#advanced-search-ui, #search-results-ui, #macro-ui").css( {
+                marginLeft: function() {
+                    return -($(this).width() / 2);
+                }
+            } );
+        }
+
+        $( '#macro-ui' ).on( 'shown', function() {
+            if ( macroEditor ) return;
+
+            macroEditor = CodeMirror(
+                $('#macro-editor')[0],
+                {
+                    extraKeys: {
+                        'Ctrl-D': function( cm ) {
+                            var cur = cm.getCursor();
+
+                            cm.replaceRange( "‡", cur, null );
+                        },
+                    },
+                    mode: 'null',
+                    lineNumbers: true,
+                    readOnly: true,
+                }
+            );
+            var saveTimeout;
+            macroEditor.on( 'change', function( cm, change ) {
+                $('#macro-save-message').empty();
+                if ( change.origin == 'setValue' ) return;
+
+                if ( saveTimeout ) clearTimeout( saveTimeout );
+                saveTimeout = setTimeout( function() {
+                    saveMacro();
+
+                    saveTimeout = null;
+                }, 500 );
+            } );
+
+            showSavedMacros();
+        } );
+
+        var saveableBackends = [];
+        $.each( backends, function( id, backend ) {
+            if ( backend.save ) saveableBackends.push( [ backend.saveLabel, id ] );
+        } );
+        saveableBackends.sort();
+        $.each( saveableBackends, function( undef, backend ) {
+            $( '#save-dropdown' ).append( '<li><a href="#" data-backend="' + backend[1] + '">' + backend[0] + '</a></li>' );
+        } );
+
+        var macro_format_list = $.map( Macros.formats, function( format, name ) {
+            return $.extend( { name: name }, format );
+        } );
+        macro_format_list.sort( function( a, b ) {
+            return a.description.localeCompare(b.description);
+        } );
+        $.each( macro_format_list, function() {
+            $('#macro-format').append( '<option value="' + this.name + '">' + this.description + '</option>' );
+        } );
+
+        // Click bindings
+        $( '#save-record, #save-dropdown a' ).click( function() {
+            $( '#save-record' ).find('i').attr( 'class', 'icon-loading' ).siblings( 'span' ).text( _("Saving...") );
+
+            function finishCb(result) {
+                if ( result.error == 'syntax' ) {
+                    humanMsg.displayAlert( _("Incorrect syntax, cannot save"), { className: 'humanError' } );
+                } else if ( result.error == 'invalid' ) {
+                    humanMsg.displayAlert( _("Record structure invalid, cannot save"), { className: 'humanError' } );
+                } else if ( !result.error ) {
+                    humanMsg.displayAlert( _("Record saved "), { className: 'humanSuccess' } );
+                }
+
+                $.each( result.errors || [], function( undef, error ) {
+                    switch ( error.type ) {
+                        case 'noTag':
+                            editor.addError( error.line, _("Invalid tag number") );
+                            break;
+                        case 'noIndicators':
+                            editor.addError( error.line, _("Invalid indicators") );
+                            break;
+                        case 'noSubfields':
+                            editor.addError( error.line, _("Tag has no subfields") );
+                            break;
+                        case 'missingTag':
+                            editor.addError( null, _("Missing mandatory tag: ") + error.tag );
+                            break;
+                        case 'missingSubfield':
+                            if ( error.subfield == '@' ) {
+                                editor.addError( error.line, _("Missing control field contents") );
+                            } else {
+                                editor.addError( error.line, _("Missing mandatory subfield: ‡") + error.subfield );
+                            }
+                            break;
+                        case 'unrepeatableTag':
+                            editor.addError( error.line, _("Tag ") + error.tag + _(" cannot be repeated") );
+                            break;
+                        case 'unrepeatableSubfield':
+                            editor.addError( error.line, _("Subfield ‡") + error.subfield + _(" cannot be repeated") );
+                            break;
+                        case 'itemTagUnsupported':
+                            editor.addError( error.line, _("Item tags cannot currently be saved") );
+                            break;
+                    }
+                } );
+
+                $( '#save-record' ).find('i').attr( 'class', 'icon-hdd' );
+
+                if ( result.error ) {
+                    // Reset backend info
+                    setSource( [ state.backend, state.recordID ] );
+                }
+            }
+
+            var backend = $( this ).data( 'backend' ) || ( state.saveBackend );
+            if ( state.backend == backend ) {
+                saveRecord( backend + '/' + state.recordID, editor, finishCb );
+            } else {
+                saveRecord( backend + '/', editor, finishCb );
+            }
+
+            return false;
+        } );
+
+        $('#import-records').click( function() {
+            $('#import-records-input')
+                .off('change')
+                .change( function() {
+                    if ( !this.files || !this.files.length ) return;
+
+                    var file = this.files[0];
+                    var reader = new FileReader();
+
+                    reader.onload = function() {
+                        var record = new MARC.Record();
+
+                        if ( /\.(mrc|marc|iso|iso2709|marcstd)$/.test( file.name ) ) {
+                            record.loadISO2709( reader.result );
+                        } else if ( /\.(xml|marcxml)$/.test( file.name ) ) {
+                            record.loadMARCXML( reader.result );
+                        } else {
+                            humanMsg.displayAlert( _("Unknown record type, cannot import"), { className: 'humanError' } );
+                            return;
+                        }
+
+                        if (record.marc8_corrupted) humanMsg.displayMsg( '<h3>' + _("Possible record corruption") + '</h3><p>' + _("Record not marked as UTF-8, may be corrupted") + '</p>', { className: 'humanError' } );
+
+                        editor.displayRecord( record );
+                    };
+
+                    reader.readAsText( file );
+                } )
+                .click();
+
+            return false;
+        } );
+
+        $('#open-macros').click( function() {
+            $('#macro-ui').modal('show');
+
+            return false;
+        } );
+
+        $('#run-macro').click( function() {
+            var result = Macros.Run( editor, $('#macro-format').val(), macroEditor.getValue() );
+
+            if ( !result.errors.length ) {
+                $('#macro-ui').modal('hide');
+                return false;
+            }
+
+            var errors = [];
+            $.each( result.errors, function() {
+                var error = '<b>' + _("Line ") + (this.line + 1) + ':</b> ';
+
+                switch ( this.error ) {
+                    case 'failed': error += _("failed to run"); break;
+                    case 'unrecognized': error += _("unrecognized command"); break;
+                }
+
+                errors.push(error);
+            } );
+
+            humanMsg.displayMsg( '<h3>' + _("Failed to run macro:") + '</h3><ul><li>' + errors.join('</li><li>') + '</li></ul>', { className: 'humanError' } );
+
+            return false;
+        } );
+
+        $('#delete-macro').click( function() {
+            if ( !macroEditor.activeMacro || !confirm( _("Are you sure you want to delete this macro?") ) ) return;
+
+            storeMacro( macroEditor.activeMacro, undefined );
+            showSavedMacros();
+            loadMacro( undefined );
+
+            return false;
+        } );
+
+        $( '#switch-editor' ).click( function() {
+            if ( !confirm( _("Any changes will not be saved. Continue?") ) ) return;
+
+            $.cookie( 'catalogue_editor_[% USER_INFO.borrowernumber %]', 'basic', { expires: 365, path: '/' } );
+
+            if ( state.backend == 'catalog' ) {
+                window.location = '/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=' + state.recordID;
+            } else if ( state.backend == 'new' ) {
+                window.location = '/cgi-bin/koha/cataloguing/addbiblio.pl';
+            } else {
+                humanMsg.displayAlert( _("Cannot open this record in the basic editor"), { className: 'humanError' } );
+            }
+        } );
+
+        $( '#show-advanced-search' ).click( function() {
+            showAdvancedSearch();
+
+            return false;
+        } );
+
+        $('#advanced-search').submit( function() {
+            startAdvancedSearch();
+
+            return false;
+        } );
+
+        $( document ).on( 'click', 'a.search-nav', function() {
+            if ( Search.Fetch( { offset: $( this ).data( 'offset' ) } ) ) {
+                $("#search-overlay").show();
+            }
+
+            return false;
+        });
+
+        $( document ).on( 'click', 'th[data-sort-label]', function() {
+            var direction;
+
+            if ( $( this ).hasClass( 'sorting_asc' ) ) {
+                direction = 'desc';
+            } else {
+                direction = 'asc';
+            }
+
+            if ( Search.Fetch( { sort_key: $( this ).data( 'sort-label' ), sort_direction: direction } ) ) {
+                showSearchSorting( $( this ).data( 'sort-label' ), direction );
+
+                $("#search-overlay").show();
+            }
+
+            return false;
+        });
+
+        $( document ).on( 'change', 'input.search-toggle-server', function() {
+            var server = z3950Servers[ $( this ).closest('li').data('server-id') ];
+            server.checked = this.checked;
+
+            if ( $('#search-results-ui').is( ':visible' ) && Search.Fetch() ) {
+                $("#search-overlay").show();
+            }
+        } );
+
+        // Key bindings
+        bindGlobalKeys();
+
+        // Setup UI
+        $("#advanced-search-ui, #search-results-ui, #macro-ui").each( function() {
+            $(this).modal({ show: false });
+        } );
+
+        var $quicksearch = $('#quicksearch fieldset');
+        $('<div id="quicksearch-overlay"><h3>' + _("Search unavailable") + '</h3> <p></p></div>').css({
+            position: 'absolute',
+            top: $quicksearch.offset().top,
+            left: $quicksearch.offset().left,
+            height: $quicksearch.outerHeight(),
+            width: $quicksearch.outerWidth(),
+        }).appendTo(document.body).hide();
+
+        var prevAlerts = [];
+        humanMsg.logMsg = function(msg, options) {
+            $('#show-alerts').popover('hide');
+            prevAlerts.unshift('<li>' + msg + '</li>');
+            prevAlerts.splice(5, 999); // Truncate old messages
+        };
+
+        $('#show-alerts').popover({
+            html: true,
+            placement: 'bottom',
+            content: function() {
+                return '<div id="alerts-container"><ul>' + prevAlerts.join('') + '</ul></div>';
+            },
+        });
+
+        $('#show-shortcuts').popover({
+            html: true,
+            placement: 'bottom',
+            content: function() {
+                return '<div id="shortcuts-container">' + $('#shortcuts-contents').html() + '</div>';
+            },
+        });
+
+        $('#new-record' ).click( function() {
+            if ( editor.modified && !confirm( _("Are you sure you want to erase your changes?") ) ) return;
+
+            openRecord( 'new/', editor );
+            return false;
+        } );
+
+        // Start editor
+        Preferences.Load( [% USER_INFO.borrowernumber || 0 %] );
+        displayPreferences(editor);
+        makeAuthorisedValueWidgets( '' );
+        Search.Init( {
+            page_size: 20,
+            onresults: function(data) { showSearchResults( editor, data ) },
+            onerror: handleSearchError,
+        } );
+
+        function finishCb( data ) {
+            if ( data.error ) openRecord( 'new/', editor, finishCb );
+
+            Resources.GetAll().done( function() {
+                $("#loading").hide();
+                $( window ).resize( onResize ).resize();
+                editor.focus();
+            } );
+        }
+
+        if ( "[% auth_forwarded_hash %]" ) {
+            document.location.hash = "[% auth_forwarded_hash %]";
+        }
+
+        if ( !document.location.hash || !openRecord( document.location.hash.slice(1), editor, finishCb ) ) {
+            openRecord( 'new/', editor, finishCb );
+        }
+    } );
+} )();
+
+</script>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index aeca0074d3..012e604c19 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -81,7 +81,7 @@
                                         [% END %]
                                     [% END %]
                                     [% IF ( loggedinusername ) %]
-                                        <li><p class="members navbar-text">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></p></li>
+                                        <li><p class="members navbar-text">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% USER_INFO.title %] [% USER_INFO.firstname %] [% USER_INFO.surname %]</span></a></p></li>
                                         <li class="divider-vertical"></li>
                                     [% END %]
                                 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
index 1aa3a4b7b2..e91c170e48 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
@@ -10,7 +10,7 @@
             <ul class="breadcrumb">
                 <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
                 [% IF ( loggedinusername ) %]
-                    <li><a href="/cgi-bin/koha/opac-user.pl">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</a> <span class="divider">&rsaquo;</span></li>
+                    <li><a href="/cgi-bin/koha/opac-user.pl">[% USER_INFO.title %] [% USER_INFO.firstname %] [% USER_INFO.surname %]</a> <span class="divider">&rsaquo;</span></li>
                 [% END %]
                 <li>
                     [% IF ( showprivateshelves ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 546cb24964..1fb2e47b4e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -92,11 +92,7 @@
 
                     [% UNLESS ( message ) %]
                         [% UNLESS ( none_available ) %]
-                            <h3>Confirm holds for:
-                                [% FOREACH USER_INF IN USER_INFO %]
-                                    [% USER_INF.firstname %] [% USER_INF.surname %] ([% USER_INF.cardnumber %])
-                                [% END %]
-                            </h3>
+                            <h3>Confirm holds for:[% USER_INFO.firstname %] [% USER_INFO.surname %] ([% USER_INFO.cardnumber %])</h3>
                         [% END # / UNLESS none_available %]
 
                         [% IF (RESERVE_CHARGE) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
index 6421138382..1bb22d7eef 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
@@ -11,7 +11,7 @@
     <ul class="breadcrumb">
         <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
         [% IF ( loggedinusername ) %]
-            <li><a href="/cgi-bin/koha/opac-user.pl">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</a> <span class="divider">&rsaquo;</span></li>
+            <li><a href="/cgi-bin/koha/opac-user.pl">[% USER_INFO.title %] [% USER_INFO.firstname %] [% USER_INFO.surname %]</a> <span class="divider">&rsaquo;</span></li>
         [% END %]
         <li>Share a list</li>
     </ul> <!-- / .breadcrumb -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index 3478866a3e..1bd70983cc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -47,7 +47,7 @@
     <ul class="breadcrumb noprint">
         <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
         [% IF ( loggedinusername ) %]
-            <li><a href="/cgi-bin/koha/opac-user.pl">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</a> <span class="divider">&rsaquo;</span></li>
+            <li><a href="/cgi-bin/koha/opac-user.pl">[% USER_INFO.title %] [% USER_INFO.firstname %] [% USER_INFO.surname %]</a> <span class="divider">&rsaquo;</span></li>
         [% END %]
 
         [% IF ( category1 ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
index bf17867a60..6d4a47ca65 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
@@ -13,7 +13,7 @@
     <div class="main">
         <ul class="breadcrumb">
             <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
-            <li><a href="/cgi-bin/koha/opac-user.pl">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</a> <span class="divider">&rsaquo;</span></li>
+            <li><a href="/cgi-bin/koha/opac-user.pl">[% USER_INFO.title %] [% USER_INFO.firstname %] [% USER_INFO.surname %]</a> <span class="divider">&rsaquo;</span></li>
             <li><a href="#">Your purchase suggestions</a></li>
         </ul>
 
-- 
2.39.5