Skip to content

Commit

Permalink
Revert "MDL-43852 Filters Fixed naked-OR conditions."
Browse files Browse the repository at this point in the history
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.

This reverts commit 840c1c5.
  • Loading branch information
danpoltawski committed Mar 6, 2014
1 parent 170c87d commit dc88f66
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion course/format/renderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,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);
}
Expand Down
2 changes: 1 addition & 1 deletion filter/mediaplugin/filter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dc88f66

Please sign in to comment.