diff --git a/lib/weblib.php b/lib/weblib.php
index 0aac8106c0b..b88019fc9e8 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4091,7 +4091,7 @@ function helpbutton ($page, $title='', $module='moodle', $image=true, $linktext=
     $linkobject .= '</span>';
 
     if ($text) {
-        $url = '/help.php?module='. $module .'&amp;text='. htmlentities(urlencode($text));
+        $url = '/help.php?module='. $module .'&amp;text='. s(urlencode($text));
     } else {
         $url = '/help.php?module='. $module .'&amp;file='. $page .'.html';
     }
diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php
index e78521f47e7..ee255e0ec16 100644
--- a/mod/assignment/restorelib.php
+++ b/mod/assignment/restorelib.php
@@ -324,7 +324,7 @@
                     $status = update_record("assignment",$assignment);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/chat/restorelib.php b/mod/chat/restorelib.php
index 2762199b68e..dddf7fec5a6 100644
--- a/mod/chat/restorelib.php
+++ b/mod/chat/restorelib.php
@@ -222,7 +222,7 @@
                     $status = update_record("chat",$chat);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/choice/restorelib.php b/mod/choice/restorelib.php
index bfe26dc0311..3aca867a64b 100644
--- a/mod/choice/restorelib.php
+++ b/mod/choice/restorelib.php
@@ -349,7 +349,7 @@ function choice_options_restore_mods($choiceid,$info,$restore) {
                     $status = update_record("choice",$choice);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/forum/restorelib.php b/mod/forum/restorelib.php
index a3f81baca3e..9ab55de5266 100644
--- a/mod/forum/restorelib.php
+++ b/mod/forum/restorelib.php
@@ -1044,7 +1044,7 @@
                     $status = update_record("forum_posts",$post);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
@@ -1078,7 +1078,7 @@
                     $status = update_record("forum",$forum);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/glossary/restorelib.php b/mod/glossary/restorelib.php
index 6f20b23c9c3..fdb6925ca63 100644
--- a/mod/glossary/restorelib.php
+++ b/mod/glossary/restorelib.php
@@ -614,7 +614,7 @@
                     $status = update_record("glossary_entries",$entry);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
@@ -648,7 +648,7 @@
                     $status = update_record("glossary",$glossary);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/label/restorelib.php b/mod/label/restorelib.php
index f3792c31a82..9b3aa6f6a43 100644
--- a/mod/label/restorelib.php
+++ b/mod/label/restorelib.php
@@ -83,7 +83,7 @@
                     $status = update_record("label", $label);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php
index 8620bfa9e7c..db29074827e 100644
--- a/mod/lesson/importppt.php
+++ b/mod/lesson/importppt.php
@@ -218,7 +218,7 @@ function extract_data($pages, $courseid, $lessonname, $modname) {
         
         $tags = '<div><img>'; // should also allow <b><i>
         $string = strip_tags($content,$tags);
-        //echo htmlentities($string);
+        //echo s($string);
 
         $matches = array();
         // this will look for a non nested tag that is closed
@@ -584,4 +584,4 @@ function book_save_objects($chapters, $bookid, $pageid='0') {
     return true;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/mod/lesson/restorelib.php b/mod/lesson/restorelib.php
index bf8814319f3..cac89b57321 100644
--- a/mod/lesson/restorelib.php
+++ b/mod/lesson/restorelib.php
@@ -765,7 +765,7 @@
                     $status = update_record("lesson_pages",$page);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php
index 7a5157c1161..9a895808cd2 100644
--- a/mod/quiz/restorelib.php
+++ b/mod/quiz/restorelib.php
@@ -481,7 +481,7 @@
                     $status = update_record("quiz",$quiz);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/resource/restorelib.php b/mod/resource/restorelib.php
index 0cb24e78a2b..2d5cd21d8f6 100644
--- a/mod/resource/restorelib.php
+++ b/mod/resource/restorelib.php
@@ -202,9 +202,9 @@
                     $status = update_record("resource",$resource);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content1).'<br />changed to<br />'.htmlentities($result1).'<hr /><br />';
-                            echo '<br /><hr />'.htmlentities($content2).'<br />changed to<br />'.htmlentities($result2).'<hr /><br />';
-                            echo '<br /><hr />'.htmlentities($content3).'<br />changed to<br />'.htmlentities($result3).'<hr /><br />';
+                            echo '<br /><hr />'.s($content1).'<br />changed to<br />'.s($result1).'<hr /><br />';
+                            echo '<br /><hr />'.s($content2).'<br />changed to<br />'.s($result2).'<hr /><br />';
+                            echo '<br /><hr />'.s($content3).'<br />changed to<br />'.s($result3).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/scorm/restorelib.php b/mod/scorm/restorelib.php
index 748d6485697..2e9b0142252 100755
--- a/mod/scorm/restorelib.php
+++ b/mod/scorm/restorelib.php
@@ -484,7 +484,7 @@
                     $status = update_record("scorm",$scorm);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/survey/restorelib.php b/mod/survey/restorelib.php
index 6dac48b27ad..53c658518b7 100644
--- a/mod/survey/restorelib.php
+++ b/mod/survey/restorelib.php
@@ -288,7 +288,7 @@
                     $status = update_record("survey",$survey);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/wiki/restorelib.php b/mod/wiki/restorelib.php
index 39352fdfa7a..8a016b0e594 100644
--- a/mod/wiki/restorelib.php
+++ b/mod/wiki/restorelib.php
@@ -357,7 +357,7 @@
                     $status = update_record("wiki_pages",$page);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
@@ -391,7 +391,7 @@
                     $status = update_record("wiki",$wiki);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
diff --git a/mod/workshop/restorelib.php b/mod/workshop/restorelib.php
index e8bf1cc151f..1bd107e83ae 100644
--- a/mod/workshop/restorelib.php
+++ b/mod/workshop/restorelib.php
@@ -752,7 +752,7 @@
                     $status = update_record("workshop",$workshop);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }