Skip to content
Browse files

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 96315c3.
  • Loading branch information...
1 parent bf6f9d0 commit 1c99db293d0c8516d2aa63a183afa31b64712efc @danpoltawski danpoltawski committed Mar 6, 2014
Showing with 2 additions and 2 deletions.
  1. +1 −1 course/format/renderer.php
  2. +1 −1 filter/mediaplugin/filter.php
View
2 course/format/renderer.php
@@ -583,7 +583,7 @@ protected function section_nav_selection($course, $sections, $displaysection) {
$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);
}
View
2 filter/mediaplugin/filter.php
@@ -66,7 +66,7 @@ public function filter($text, array $options = array()) {
}
// 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

0 comments on commit 1c99db2

Please sign in to comment.
Something went wrong with that request. Please try again.