diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php
index 692e23f529d..582add37349 100644
--- a/mod/assignment/restorelib.php
+++ b/mod/assignment/restorelib.php
@@ -319,7 +319,7 @@
                     $assignment->description = addslashes($result);
                     $status = update_record("assignment",$assignment);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to<br />".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
diff --git a/mod/chat/restorelib.php b/mod/chat/restorelib.php
index 1ebb00a3c04..77eed88ee42 100644
--- a/mod/chat/restorelib.php
+++ b/mod/chat/restorelib.php
@@ -217,7 +217,7 @@
                     $chat->intro = addslashes($result);
                     $status = update_record("chat",$chat);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
diff --git a/mod/choice/restorelib.php b/mod/choice/restorelib.php
index b83c9597ef4..47254fc2d6e 100644
--- a/mod/choice/restorelib.php
+++ b/mod/choice/restorelib.php
@@ -338,7 +338,7 @@ function choice_options_restore_mods($choiceid,$info,$restore) {
                     $choice->text = addslashes($result);
                     $status = update_record("choice",$choice);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
diff --git a/mod/forum/restorelib.php b/mod/forum/restorelib.php
index e0b8be301d4..b81f7a79dcf 100644
--- a/mod/forum/restorelib.php
+++ b/mod/forum/restorelib.php
@@ -984,7 +984,7 @@
                     $post->message = addslashes($result);
                     $status = update_record("forum_posts",$post);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to<br />".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
@@ -1014,7 +1014,7 @@
                     $forum->intro = addslashes($result);
                     $status = update_record("forum",$forum);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
diff --git a/mod/glossary/restorelib.php b/mod/glossary/restorelib.php
index 24fbad4f90f..4fdfc106ad2 100644
--- a/mod/glossary/restorelib.php
+++ b/mod/glossary/restorelib.php
@@ -599,7 +599,7 @@
                     $entry->definition = addslashes($result);
                     $status = update_record("glossary_entries",$entry);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to<br />".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
@@ -629,7 +629,7 @@
                     $glossary->intro = addslashes($result);
                     $status = update_record("glossary",$glossary);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
diff --git a/mod/label/restorelib.php b/mod/label/restorelib.php
index 38d06609690..b8aae4ea9fa 100644
--- a/mod/label/restorelib.php
+++ b/mod/label/restorelib.php
@@ -80,7 +80,7 @@
                     $label->content = addslashes($result);
                     $status = update_record("label", $label);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
diff --git a/mod/lesson/restorelib.php b/mod/lesson/restorelib.php
index d832f497b30..4aed15235a8 100644
--- a/mod/lesson/restorelib.php
+++ b/mod/lesson/restorelib.php
@@ -726,7 +726,7 @@
                     $page->contents = addslashes($result);
                     $status = update_record("lesson_pages",$page);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to<br />".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php
index 49131c1570a..6ba4c322b44 100644
--- a/mod/quiz/restorelib.php
+++ b/mod/quiz/restorelib.php
@@ -1948,7 +1948,7 @@
                     $quiz->intro = addslashes($result);
                     $status = update_record("quiz",$quiz);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
diff --git a/mod/resource/restorelib.php b/mod/resource/restorelib.php
index 1275d56b3ff..2c5399694da 100644
--- a/mod/resource/restorelib.php
+++ b/mod/resource/restorelib.php
@@ -191,8 +191,8 @@
                     $resource->summary = addslashes($result2);
                     $status = update_record("resource",$resource);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content1."<br />changed to</br>".$result1."<hr /><br />";
-                        echo "<br /><hr />".$content2."<br />changed to</br>".$result2."<hr /><br />";
+                        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 />';
                     }
                 }
                 //Do some output
diff --git a/mod/scorm/restorelib.php b/mod/scorm/restorelib.php
index bb9ee53e193..e4323efa2d2 100755
--- a/mod/scorm/restorelib.php
+++ b/mod/scorm/restorelib.php
@@ -441,7 +441,7 @@
                     $scorm->summary = addslashes($result);
                     $status = update_record("scorm",$scorm);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
diff --git a/mod/survey/restorelib.php b/mod/survey/restorelib.php
index 85f945f46cc..8e159adbb93 100644
--- a/mod/survey/restorelib.php
+++ b/mod/survey/restorelib.php
@@ -281,7 +281,7 @@
                     $survey->intro = addslashes($result);
                     $status = update_record("survey",$survey);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
diff --git a/mod/wiki/restorelib.php b/mod/wiki/restorelib.php
index 6daf00ce496..aa20eee4fde 100644
--- a/mod/wiki/restorelib.php
+++ b/mod/wiki/restorelib.php
@@ -350,7 +350,7 @@
                     $page->content = addslashes($result);
                     $status = update_record("wiki_pages",$page);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to<br />".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
@@ -380,7 +380,7 @@
                     $wiki->summary = addslashes($result);
                     $status = update_record("wiki",$wiki);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output
diff --git a/mod/workshop/restorelib.php b/mod/workshop/restorelib.php
index c3bc064d77f..3ef1df108d4 100644
--- a/mod/workshop/restorelib.php
+++ b/mod/workshop/restorelib.php
@@ -733,7 +733,7 @@
                     $workshop->description = addslashes($result);
                     $status = update_record("workshop",$workshop);
                     if ($CFG->debug>7) {
-                        echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
+                        echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
                     }
                 }
                 //Do some output