From 1c99db293d0c8516d2aa63a183afa31b64712efc Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Thu, 6 Mar 2014 09:04:15 +0800 Subject: [PATCH] Revert "MDL-43852 Filters Fixed naked-OR conditions." While the patch worked as intended, we discovered some other concerns about use of this setting in testing. This reverts commit 96315c3478e95d79c71f0ad873f0fb1741ad4e41. --- course/format/renderer.php | 2 +- filter/mediaplugin/filter.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/course/format/renderer.php b/course/format/renderer.php index ee474f0748c..28d7bc1b78a 100644 --- a/course/format/renderer.php +++ b/course/format/renderer.php @@ -583,7 +583,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); } diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php index 9c59b6dfd1a..57e58d513dc 100644 --- a/filter/mediaplugin/filter.php +++ b/filter/mediaplugin/filter.php @@ -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