Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-50937-fixes' of git://github.com/andrewnicols/moodle
  • Loading branch information
andrewnicols committed Jul 20, 2016
2 parents ff00396 + eb3839d commit 4cb32b2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/amd/build/tag.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/amd/src/tag.js
Expand Up @@ -36,7 +36,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
$('body').delegate('.tagarea[data-ta] a[data-quickload=1]', 'click', function(e) {
e.preventDefault();
var target = $(this),
query = target.context.search.replace(/^\?/, ''),
query = target[0].search.replace(/^\?/, ''),
tagarea = target.closest('.tagarea[data-ta]'),
args = query.split('&').reduce(function(s, c) {
var t = c.split('=');
Expand Down
2 changes: 1 addition & 1 deletion theme/bootstrapbase/renderers/core_renderer.php
Expand Up @@ -107,7 +107,7 @@ protected function render_custom_menu(custom_menu $menu) {
} else {
$currentlang = $strlang;
}
$this->language = $menu->add($currentlang, new moodle_url('#'), $strlang, 10000);
$this->language = $menu->add($currentlang, new moodle_url(''), $strlang, 10000);
foreach ($langs as $langtype => $langname) {
$this->language->add($langname, new moodle_url($this->page->url, array('lang' => $langtype)), $langname);
}
Expand Down

0 comments on commit 4cb32b2

Please sign in to comment.