L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now both p() and s() respect html entities.

Browse Source 
(and some unmerged silent headers)

Merged from MOODLE_15_STABLE
This commit is contained in:
stronk7
2005-09-10 11:07:09 +00:00
parent b4d6179c4d
commit df8d3e66f4
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/weblib.php
+3 -7
View File
@@ -101,7 +101,7 @@ function s($var) {
if ($var == '0') { // for integer 0, boolean false, string '0'
return '0';
}
return htmlSpecialChars(stripslashes_safe($var));
return preg_replace("/&(\w+|#\d+);/i", "&$1;", htmlspecialchars(stripslashes_safe($var)));
}
/**
@@ -114,11 +114,7 @@ function s($var) {
* @return string
*/
function p($var) {
if ($var == '0') { // for integer 0, boolean false, string '0'
echo '0';
} else {
echo htmlSpecialChars(stripslashes_safe($var));
}
echo s($var);
}
@@ -3718,7 +3714,7 @@ function print_scale_menu_helpbutton($courseid, $scale) {
function error ($message, $link='') {
global $CFG, $SESSION;
header('HTTP/1.0 404 Not Found');
@header('HTTP/1.0 404 Not Found');
print_header(get_string('error'));
echo '<br />';