From 840c1c554d12d9214928da6f10989fc5546dbb43 Mon Sep 17 00:00:00 2001 From: Gordon Bateson Date: Mon, 27 Jan 2014 14:35:41 +0900 Subject: [PATCH] MDL-43852 Filters Fixed naked-OR conditions. --- 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 edc7d87af34..9d35994fba0 100644 --- a/course/format/renderer.php +++ b/course/format/renderer.php @@ -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); } diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php index 57e58d513dc..9c59b6dfd1a 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 -- 2.43.0