Revert "MDL-43852 Filters Fixed naked-OR conditions."
authorDan Poltawski <dan@moodle.com>
Thu, 6 Mar 2014 01:03:19 +0000 (09:03 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 6 Mar 2014 01:03:19 +0000 (09:03 +0800)
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.

This reverts commit 840c1c554d12d9214928da6f10989fc5546dbb43.

course/format/renderer.php
filter/mediaplugin/filter.php

index 9d35994..edc7d87 100644 (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);
             }
index 9c59b6d..57e58d5 100644 (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