mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity

Revert "MDL-43852 Filters Fixed naked-OR conditions."

Browse Source 
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.

This reverts commit 840c1c554d12d9214928da6f10989fc5546dbb43.
This commit is contained in:
Dan Poltawski 2014-03-06 09:03:19 +08:00
parent 170c87d808
commit dc88f6699d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/format/renderer.php
View File

@ -585,7 +585,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
$section = 1;
while ($section <= $course->numsections) {
$thissection = $modinfo->get_section_info($section);
$showsection = ($thissection->uservisible or !$course->hiddensections);
$showsection = $thissection->uservisible or !$course->hiddensections;
if (($showsection) && ($section != $displaysection) && ($url = course_get_url($course, $section))) {
$sectionmenu[$url->out(false)] = get_section_name($course, $section);
}

2
filter/mediaplugin/filter.php
View File

@ -66,7 +66,7 @@ class filter_mediaplugin extends moodle_text_filter {
}
// Check SWF permissions.
$this->trusted = (!empty($options['noclean']) or !empty($CFG->allowobjectembed));
$this->trusted = !empty($options['noclean']) or !empty($CFG->allowobjectembed);
// Handle all links that contain any 'embeddable' marker text (it could
// do all links, but the embeddable markers thing should make it faster