filters: MDL 7336 Remove remaining references to ->filters

diff --git a/admin/report/security/lib.php b/admin/report/security/lib.php
index 2daf7dc13318eb1f4e5db1dd2137b06a2695c51f..4e267050cb1f53bf29f464df66219b8d38d33600 100644 (file)
--- 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 f86445441d27a07e4fdcaf26e34059389a093603..d6953e2f62795577773f33d4362a59137b327516 100644 (file)
--- 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 b572a4c47adb958e90c2d8e459f662e1b50e63cf..eeb326df79a7fc2c4a86b705bd9e08add83106db 100644 (file)
--- 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 6c485421cd6221f0147b4e668a760282b35192ea..e7240b52c1a29d49842686b2b145ffef64e5a830 100644 (file)
--- 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 917239c681a8a3c5bff69a9b562b2182843ef8ec..0940b41eec7047dbe95586b1f8e5daa2492d6f1d 100644 (file)
--- 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 3ac929a299cd70204e8d3eedbc27f76cb63dd589..d24619210189e5c3d59f13f8d866a0b125dddcf1 100644 (file)
--- 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);