From: scyrma <scyrma>
Date: Tue, 18 Mar 2008 01:22:37 +0000 (+0000)
Subject: MDL-12514 - Added missing js library (thanks Johannes Albert) and fixed missing strin... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ffa2134012db5c5b4827d8428352d90f200c979b;p=moodle.git

MDL-12514 - Added missing js library (thanks Johannes Albert) and fixed missing string escaping. (merge)
---

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index ab1970825d..f2439cc1a4 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -8,7 +8,7 @@
     require_once("lib.php");
     #require_once("$CFG->dirroot/course/lib.php"); // For side-blocks    
     require_once($CFG->libdir . '/ajax/ajaxlib.php');
-    require_js(array('yui_yahoo','yui_connection'));
+    require_js(array('yui_yahoo', 'yui_event', 'yui_connection'));
 
     $ewiki_action = optional_param('ewiki_action', '', PARAM_ALPHA);     // Action on Wiki-Page
     $id           = optional_param('id', 0, PARAM_INT);                  // Course Module ID, or
@@ -451,7 +451,7 @@
         } else {
             if (ajaxenabled()) {
                 // OK, the page is now locked to us. Put in the AJAX for keeping the lock
-                $strlockcancelled=get_string('lockcancelled','wiki');
+                $strlockcancelled=addslashes(get_string('lockcancelled','wiki'));
                 $strnojslockwarning=get_string('nojslockwarning','wiki');
                 $intervalms=WIKI_LOCK_RECONFIRM*1000;
                 print "