Index: lams_central/web/learner.jsp
===================================================================
diff -u -r27a9e58b46446d891cf6b081e8fb6fb6f6294e2e -raffc66817dcbf5a677c7742c13fb93a9b35ae97a
--- lams_central/web/learner.jsp	(.../learner.jsp)	(revision 27a9e58b46446d891cf6b081e8fb6fb6f6294e2e)
+++ lams_central/web/learner.jsp	(.../learner.jsp)	(revision affc66817dcbf5a677c7742c13fb93a9b35ae97a)
@@ -9,17 +9,27 @@
 <lams:html>
 <lams:head>
 
-<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
-	
-<c:choose>
-	<c:when test="${enableFlash}">
-		<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainflash.jsp?lessonID=<c:out value="${param.lessonID}"/>&portfolioEnabled=<c:out value="${param.portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${param.presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${param.presenceImEnabled}"/>&presenceUrl=<c:out value="${param.presenceUrl}"/>&createDateTime=<c:out value="${param.createDateTime}"/>&title=<c:out value="${param.title}"/><c:if test="${param.mode != null}">&mode=<c:out value="${param.mode}"/></c:if><c:if test="${param.param.notifyCloseURL != null}">&notifyCloseURL=<c:out value="${param.param.notifyCloseURL}"/></c:if>">
-	</c:when>
-	<c:otherwise>
-		<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainnoflash.jsp?lessonID=<c:out value="${param.lessonID}"/>&portfolioEnabled=<c:out value="${param.portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${param.presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${param.presenceImEnabled}"/>&presenceUrl=<c:out value="${param.presenceUrl}"/>&createDateTime=<c:out value="${param.createDateTime}"/>&title=<c:out value="${param.title}"/><c:if test="${param.mode != null}">&mode=<c:out value="${param.mode}"/></c:if><c:if test="${param.param.notifyCloseURL != null}">&notifyCloseURL=<c:out value="${param.param.notifyCloseURL}"/></c:if>">
-	</c:otherwise>
-</c:choose>
+	<%-- if coming from lessonIntro.jsp convert received parameters into page variables --%>
+	<c:if test="${not empty param.lessonID}"> <c:set var="lessonID" value="${param.lessonID}" /> </c:if>
+	<c:if test="${not empty param.portfolioEnabled}"> <c:set var="portfolioEnabled" value="${param.portfolioEnabled}" /> </c:if>
+	<c:if test="${not empty param.presenceEnabledPatch}"> <c:set var="presenceEnabledPatch" value="${param.presenceEnabledPatch}" /> </c:if>
+	<c:if test="${not empty param.presenceImEnabled}"> <c:set var="presenceImEnabled" value="${param.presenceImEnabled}" /> </c:if>
+	<c:if test="${not empty param.presenceUrl}"> <c:set var="presenceUrl" value="${param.presenceUrl}" /> </c:if>
+	<c:if test="${not empty param.createDateTime}"> <c:set var="createDateTime" value="${param.createDateTime}" /> </c:if>
+	<c:if test="${not empty param.title}"> <c:set var="title" value="${param.title}" /> </c:if>
+	<c:if test="${not empty param.mode}"> <c:set var="mode" value="${param.mode}" /> </c:if>
 
+	<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
+		
+	<c:choose>
+		<c:when test="${enableFlash}">
+			<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainflash.jsp?lessonID=<c:out value="${lessonID}"/>&portfolioEnabled=<c:out value="${portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${presenceImEnabled}"/>&presenceUrl=<c:out value="${presenceUrl}"/>&createDateTime=<c:out value="${createDateTime}"/>&title=<c:out value="${title}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if><c:if test="${param.notifyCloseURL != null}">&notifyCloseURL=<c:out value="${param.notifyCloseURL}"/></c:if>">
+		</c:when>
+		<c:otherwise>
+			<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainnoflash.jsp?lessonID=<c:out value="${lessonID}"/>&portfolioEnabled=<c:out value="${portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${presenceImEnabled}"/>&presenceUrl=<c:out value="${presenceUrl}"/>&createDateTime=<c:out value="${createDateTime}"/>&title=<c:out value="${title}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if><c:if test="${param.notifyCloseURL != null}">&notifyCloseURL=<c:out value="${param.notifyCloseURL}"/></c:if>">
+		</c:otherwise>
+	</c:choose>
+
 	<TITLE><fmt:message key="title.learner.window"/></TITLE>
 	<lams:css/>
 </lams:head>