Index: temp_moodle_dev/moodle/course/lamsbuttons.php
===================================================================
diff -u -r89659faa9ee2ac5d9c25fa5524f6925d923f00b3 -rca9dd397a5f82cabc9bf34d90c981ac0fb1c15de
--- temp_moodle_dev/moodle/course/lamsbuttons.php	(.../lamsbuttons.php)	(revision 89659faa9ee2ac5d9c25fa5524f6925d923f00b3)
+++ temp_moodle_dev/moodle/course/lamsbuttons.php	(.../lamsbuttons.php)	(revision ca9dd397a5f82cabc9bf34d90c981ac0fb1c15de)
@@ -15,6 +15,7 @@
 	<?php  require_once("../config.php");
 		$id   = optional_param('id', PARAM_INT);
 		$lamsupdateurl = optional_param('lamsUpdateURL', PARAM_TEXT);
+		$returnurl   = optional_param('returnUrl', PARAM_TEXT);  // lams url to proceed to next in sequence 
 		
 	?> 		/* Function to display Next or Finish button in LAMS sequence*/
 			function toggle(id) {  
@@ -47,7 +48,6 @@
 	
 	<div id="next">
 	<?php //Creates button that passes returnurl variable to be able to go to the Lams Next Activity
-		$returnurl   = optional_param('returnUrl', PARAM_TEXT);  // lams url to proceed to next in sequence 
 		echo '<div align="right"><p><input id="nextbutton" type="button" value="Next Activity" onclick="window.parent.location=\''.$returnurl.'\'" /></p></div>';
 	?>
 	</div>
Index: temp_moodle_dev/moodle/course/modedit-lams.php
===================================================================
diff -u -r89659faa9ee2ac5d9c25fa5524f6925d923f00b3 -rca9dd397a5f82cabc9bf34d90c981ac0fb1c15de
--- temp_moodle_dev/moodle/course/modedit-lams.php	(.../modedit-lams.php)	(revision 89659faa9ee2ac5d9c25fa5524f6925d923f00b3)
+++ temp_moodle_dev/moodle/course/modedit-lams.php	(.../modedit-lams.php)	(revision ca9dd397a5f82cabc9bf34d90c981ac0fb1c15de)
@@ -15,6 +15,7 @@
     $type          = optional_param('type', '', PARAM_ALPHANUM);
     $lamsupdateurl = optional_param('lamsUpdateURL', PARAM_TEXT); //get lamsupdateurl variable if coming from a Lams activity
     $is_learner  = optional_param('is_learner', 0, PARAM_INT);
+    $returnurl = urlencode(optional_param('returnUrl', PARAM_TEXT));
 
     if (!empty($add)) {
         $section = required_param('section', PARAM_INT);
@@ -185,7 +186,7 @@
     $mform =& new $mformclassname($form->instance, $cw->section, $cm);
     $mform->set_data($form);
     $mform->_form->_attributes['action'] = 'modedit-lams.php';
-    $mform->_form->addElement('hidden', 'lamsUpdateURL', $lamsupdateurl);
+    $mform->_form->addElement('hidden', 'lamsUpdateURL', urlencode($lamsupdateurl));
     $mform->_form->setType('lamsUpdateURL', PARAM_TEXT);
 
     if ($mform->is_cancelled()) {
@@ -418,7 +419,7 @@
         rebuild_course_cache($course->id);
         grade_regrade_final_grades($course->id);
 		
-        //LAMS: one you submit if you are in a Quiz you continue editing the 	quiz, if you're finished then return to Lams
+        //LAMS: one you submit if you are in a activity you continue editing the 	activity, if you're finished then return to Lams
         if (isset($fromform->submitbutton)) { 
         	// If is a Lams activity we add editing variable to know in the sequence when to display Next activity button or back to Lams button, we also passes is_learner variable so we know if teacher is acting as a learner or as a teacher
           	redirect("$CFG->wwwroot/mod/$module->name/view.php?id=$fromform->coursemodule&is_learner=$is_learner&editing=1");