Merge branch 'wip-MDL-61522-master' of git://github.com/marinaglancy/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2018-04-04 00:45:37 +02:00
commit 5deadc8229

View File

@ -379,7 +379,7 @@ if ($glossary->intro && $showcommonelements) {
/// Search box
if ($showcommonelements ) {
echo '<form method="post" class="form form-inline m-b-1" action="view.php">';
echo '<form method="post" class="form form-inline m-b-1" action="' . $CFG->wwwroot . '/mod/glossary/view.php">';
if ($mode == 'search') {
@ -433,7 +433,10 @@ if ($allentries) {
}
//Build paging bar
$paging = glossary_get_paging_bar($count, $page, $entriesbypage, "view.php?id=$id&amp;mode=$mode&amp;hook=".urlencode($hook)."&amp;sortkey=$sortkey&amp;sortorder=$sortorder&amp;fullsearch=$fullsearch&amp;",9999,10,'&nbsp;&nbsp;', $specialtext, -1);
$baseurl = new moodle_url('/mod/glossary/view.php', ['id' => $id, 'mode' => $mode, 'hook' => $hook,
'sortkey' => $sortkey, 'sortorder' => $sortorder, 'fullsearch' => $fullsearch]);
$paging = glossary_get_paging_bar($count, $page, $entriesbypage, $baseurl->out() . '&amp;',
9999, 10, '&nbsp;&nbsp;', $specialtext, -1);
echo '<div class="paging">';
echo $paging;