Index: lams_learning/web/requestDisplayActivity.jsp
===================================================================
diff -u -rf06070060e824f3a3a74c417e4e4ad69779d2e06 -rcf2f4262be6c89997e7e578dbcab3dd9e9c41ee0
--- lams_learning/web/requestDisplayActivity.jsp	(.../requestDisplayActivity.jsp)	(revision f06070060e824f3a3a74c417e4e4ad69779d2e06)
+++ lams_learning/web/requestDisplayActivity.jsp	(.../requestDisplayActivity.jsp)	(revision cf2f4262be6c89997e7e578dbcab3dd9e9c41ee0)
@@ -12,16 +12,16 @@
 		<title>LAMS</title>
 	</head>
 	
+		<c:if test="${empty url}">
+			<bean:parameter id="url" name="url" />
+		</c:if>
+	
 		<script language="JavaScript" type="text/JavaScript"><!--
-				function redirectPage() {
-					setTimeout("doRedirect()", 2000);
-				}
 				function doRedirect() {
-					//top.frames['LDContent'].location.href = "<c:out value='${activity.activityURLs[0].url}' />";
 					var parentWindow = window.parent;
-					parentWindow.location.href = "Activity.do?method=display&activityId=<c:out value='${activityId}' />";
+					//parentWindow.location.href = "Activity.do?method=display&activityId=<c:out value='${activityId}' />";
+					parentWindow.location.href = "<c:out value='${url}' escapeXml='false' />";
 				}
-				//window.onload = redirectPage;
 				window.onload = doRedirect;
 				//-->
 			//-->