moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-50937-fixes' of git://github.com/andrewnicols/moodle

Browse source
This commit is contained in:
Andrew Nicols 2016-07-20 11:20:08 +08:00
commit 4cb32b2b52
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/amd/build/tag.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
lib/amd/src/tag.js
View file

@ -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) { $('body').delegate('.tagarea[data-ta] a[data-quickload=1]', 'click', function(e) {
e.preventDefault(); e.preventDefault();
var target = $(this), var target = $(this),
query = target.context.search.replace(/^\?/, ''), query = target[0].search.replace(/^\?/, ''),
tagarea = target.closest('.tagarea[data-ta]'), tagarea = target.closest('.tagarea[data-ta]'),
args = query.split('&').reduce(function(s, c) { args = query.split('&').reduce(function(s, c) {
var t = c.split('='); var t = c.split('=');

2
theme/bootstrapbase/renderers/core_renderer.php
View file

@ -107,7 +107,7 @@ class theme_bootstrapbase_core_renderer extends core_renderer {
} else { } else {
$currentlang = $strlang; $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) { foreach ($langs as $langtype => $langname) {
$this->language->add($langname, new moodle_url($this->page->url, array('lang' => $langtype)), $langname); $this->language->add($langname, new moodle_url($this->page->url, array('lang' => $langtype)), $langname);
} }