filter MDL-19796 Upgraded deprecated function calls

diff --git a/filter/algebra/algebradebug.php b/filter/algebra/algebradebug.php
index 7a9b9b6c0150a660b8fb758ff4fed36593ca235a..7635f8c076a1dfcb00e9e9631cf2101c0a53c0da 100644 (file)
--- a/filter/algebra/algebradebug.php
+++ b/filter/algebra/algebradebug.php
@@ -1,4 +1,4 @@
-<?PHP // $Id$
+<?php
       // This function fetches math. images from the data directory
       // If not, it obtains the corresponding TeX expression from the cache_tex db table
       // and uses mimeTeX to create the image file
@@ -8,7 +8,7 @@
     require_once("../../config.php");
 
     if (!filter_is_enabled('filter/algebra')) {
-        error ('Filter not enabled!');
+        print_error('filternotenabled');
     }
 
     require_once($CFG->libdir.'/filelib.php');

diff --git a/filter/algebra/pix.php b/filter/algebra/pix.php
index 7417bdb1547d45485a479d96b0274805989656e6..f65c2ecab1fdef209dfb7ba78ab0cb0de55fbf98 100644 (file)
--- a/filter/algebra/pix.php
+++ b/filter/algebra/pix.php
@@ -8,7 +8,7 @@
     require_once('../../config.php');
 
     if (!filter_is_enabled('filter/algebra')) {
-        error ('Filter not enabled!');
+        print_error('filternotenabled');
     }
 
     // disable moodle specific debug messages

diff --git a/filter/manage.php b/filter/manage.php
index d07b98098a4c1315732b52a84b276c7abdb01307..a8e0e5615c80b534ee568767c831064cd2650cbe 100644 (file)
--- a/filter/manage.php
+++ b/filter/manage.php
@@ -125,7 +125,10 @@ if ($context->contextlevel == CONTEXT_COURSE and $context->instanceid == SITEID)
 }
 
 /// Print heading.
-print_heading_with_help($title, 'localfiltersettings');
+$helpicon = new moodle_help_icon();
+$helpicon->text = $title;
+$helpicon->page = 'localfiltersettings';
+echo $OUTPUT->heading_with_help($helpicon);
 
 if (empty($availablefilters)) {
     echo '<p class="centerpara">' . get_string('nofiltersenabled', 'filters') . "</p>\n";

diff --git a/filter/tex/pix.php b/filter/tex/pix.php
index 1628abd2b28982ebb5046024b3b7a0c49f821c92..efb6eb2b8934964abe9b66250b1ba175c138d4bb 100644 (file)
--- a/filter/tex/pix.php
+++ b/filter/tex/pix.php
@@ -8,7 +8,7 @@ define('NO_MOODLE_COOKIES', true); // Because it interferes with caching
     require_once('../../config.php');
 
     if (!filter_is_enabled('filter/tex')) {
-        error ('Filter not enabled!');
+        print_error('filternotenabled');
     }
 
     // disable moodle specific debug messages

diff --git a/filter/tex/texdebug.php b/filter/tex/texdebug.php
index a6a5db9f3c4a5818ca283ff5b08e241b1f779175..f5f542b06f9ee42a44024679542751934484af62 100644 (file)
--- a/filter/tex/texdebug.php
+++ b/filter/tex/texdebug.php
@@ -6,7 +6,7 @@
     require_once("../../config.php");
 
     if (!filter_is_enabled('filter/tex')) {
-        error ('Filter not enabled!');
+        print_error('filternotenabled');
     }
 
     require_once($CFG->libdir.'/filelib.php');

diff --git a/filter/tex/texed.php b/filter/tex/texed.php
index d0759256dc314ef504dd52d4fbb49ea51809b297..128617a9c1bcb40e7d86bff916f03e1cf0b8182c 100644 (file)
--- a/filter/tex/texed.php
+++ b/filter/tex/texed.php
@@ -9,7 +9,7 @@
     require_once($CFG->dirroot.'/filter/tex/lib.php');
 
     if (!filter_is_enabled('filter/tex')) {
-        error ('Filter not enabled!');
+        print_error('filternotenabled');
     }
 
     $texexp = urldecode($_SERVER['QUERY_STRING']);

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index fb03b892a0d906e5ac0ed2fe90b960ffb95cc3c2..e19b07390673a55bfece4b1d4c19e0eaa0362e4e 100644 (file)
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -208,6 +208,7 @@ $string['filemismatch'] = 'Non-core file name mismatch. The file \"$a->current\"
 $string['filterdoesnothavelocalconfig'] = 'The filter $a does not allow local configuration.';
 $string['filternotinstalled'] = 'Filter $a is not currently installed';
 $string['filternotactive'] = 'Filter $a is not currently active';
+$string['filternotenabled'] = 'Filter not enabled!';
 $string['forumblockingtoomanyposts'] = 'You have exceeded the posting threshold set for this forum';
 $string['hackdetected'] = 'Hack attack detected!';
 $string['headersent'] = 'Headers already sent';