filters: MDL 7336 Remove remaining references to ->filters

moodle · Apr 13, 2009 · 6b037e0 · 6b037e0
1 parent 5b8fa09
commit 6b037e0
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 35 deletions.
diff --git a/admin/report/security/lib.php b/admin/report/security/lib.php
@@ -226,11 +226,7 @@ function report_security_check_mediafilterswf($detailed=false) {
     $result->status  = null;
     $result->link    = "<a href=\"$CFG->wwwroot/$CFG->admin/settings.php?section=filtersettingfiltermediaplugin\">".get_string('filtersettings', 'admin').'</a>';
 
-    if (!empty($CFG->textfilters)) {
-        $activefilters = explode(',', $CFG->textfilters);
-    } else {
-        $activefilters = array();
-    }
+    $activefilters = filters_get_globally_enabled();
 
     if (array_search('filter/mediaplugin', $activefilters) !== false and !empty($CFG->filter_mediaplugin_enable_swf)) {
         $result->status = REPORT_SECURITY_CRITICAL;

diff --git a/filter/algebra/algebradebug.php b/filter/algebra/algebradebug.php
@@ -7,13 +7,8 @@
 
     require_once("../../config.php");
 
-    if (empty($CFG->textfilters)) {
+    if (!filter_is_enabled('filter/algebra')) {
         error ('Filter not enabled!');
-    } else {
-        $filters = explode(',', $CFG->textfilters);
-        if (array_search('filter/algebra', $filters) === FALSE) {
-            error ('Filter not enabled!');
-        }
     }
 
     require_once($CFG->libdir.'/filelib.php');

diff --git a/filter/algebra/pix.php b/filter/algebra/pix.php
@@ -7,13 +7,8 @@
 
     require_once('../../config.php');
 
-    if (empty($CFG->textfilters)) {
+    if (!filter_is_enabled('filter/algebra')) {
         error ('Filter not enabled!');
-    } else {
-        $filters = explode(',', $CFG->textfilters);
-        if (array_search('filter/algebra', $filters) === FALSE) {
-            error ('Filter not enabled!');
-        }
     }
 
     // disable moodle specific debug messages

diff --git a/filter/tex/pix.php b/filter/tex/pix.php
@@ -7,13 +7,8 @@
 
     require_once('../../config.php');
 
-    if (empty($CFG->textfilters)) {
+    if (!filter_is_enabled('filter/tex')) {
         error ('Filter not enabled!');
-    } else {
-        $filters = explode(',', $CFG->textfilters);
-        if (array_search('filter/tex', $filters) === FALSE) {
-            error ('Filter not enabled!');
-        }
     }
 
     // disable moodle specific debug messages

diff --git a/filter/tex/texdebug.php b/filter/tex/texdebug.php
@@ -5,13 +5,8 @@
 
     require_once("../../config.php");
 
-    if (empty($CFG->textfilters)) {
+    if (!filter_is_enabled('filter/tex')) {
         error ('Filter not enabled!');
-    } else {
-        $filters = explode(',', $CFG->textfilters);
-        if (array_search('filter/tex', $filters) === FALSE) {
-            error ('Filter not enabled!');
-        }
     }
 
     require_once($CFG->libdir.'/filelib.php');

diff --git a/filter/tex/texed.php b/filter/tex/texed.php
@@ -8,13 +8,8 @@
     require_once("../../config.php");
     require_once($CFG->dirroot.'/filter/tex/lib.php');
 
-    if (empty($CFG->textfilters)) {
+    if (!filter_is_enabled('filter/tex')) {
         error ('Filter not enabled!');
-    } else {
-        $filters = explode(',', $CFG->textfilters);
-        if (array_search('filter/tex', $filters) === FALSE) {
-            error ('Filter not enabled!');
-        }
     }
 
     error_reporting(E_ALL);