From 6b037e0420de28d2c1d24197fd861c5552c91f76 Mon Sep 17 00:00:00 2001
From: tjhunt <tjhunt>
Date: Mon, 13 Apr 2009 07:04:32 +0000
Subject: [PATCH] filters: MDL 7336 Remove remaining references to ->filters

---
 admin/report/security/lib.php   | 6 +-----
 filter/algebra/algebradebug.php | 7 +------
 filter/algebra/pix.php          | 7 +------
 filter/tex/pix.php              | 7 +------
 filter/tex/texdebug.php         | 7 +------
 filter/tex/texed.php            | 7 +------
 6 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/admin/report/security/lib.php b/admin/report/security/lib.php
index 2daf7dc133..4e267050cb 100644
--- 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
index f86445441d..d6953e2f62 100644
--- 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
index b572a4c47a..eeb326df79 100644
--- 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
index 6c485421cd..e7240b52c1 100644
--- a/filter/tex/pix.php
+++ b/filter/tex/pix.php
@@ -7,13 +7,8 @@ define('NO_MOODLE_COOKIES', true); // Because it interferes with caching
 
     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
index 917239c681..0940b41eec 100644
--- 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
index 3ac929a299..d246192101 100644
--- 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);
-- 
2.39.5