mirror of
https://github.com/moodle/moodle.git
synced 2025-04-16 14:02:32 +02:00
Merge branch 'wip-MDL-61522-master' of git://github.com/marinaglancy/moodle
This commit is contained in:
commit
5deadc8229
@ -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&mode=$mode&hook=".urlencode($hook)."&sortkey=$sortkey&sortorder=$sortorder&fullsearch=$fullsearch&",9999,10,' ', $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() . '&',
|
||||
9999, 10, ' ', $specialtext, -1);
|
||||
|
||||
echo '<div class="paging">';
|
||||
echo $paging;
|
||||
|
Loading…
x
Reference in New Issue
Block a user