Index: lams_learning/web/loadToolActivity.jsp
===================================================================
diff -u -rd1b9c2aa2766fbf3a287e8184aee6f8af294924b -r472bcb813040efc160e074021be5c71c15455f00
--- lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision d1b9c2aa2766fbf3a287e8184aee6f8af294924b)
+++ lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 472bcb813040efc160e074021be5c71c15455f00)
@@ -36,18 +36,19 @@
 	protocol = "http://";
 }
 String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";
-String pathToShare = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../..";
 
 %>
+<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
 
-<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}" version="${activityForm.version}" redirect="true"/>
+<c:if test="${enableFlash}">
+	<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}" version="${activityForm.version}" redirect="true"/>
+</c:if>
 
 <div id="content">
 
 	<c:if test="${!empty activityForm.activityURLs}">
 		
 		<script language="JavaScript" type="text/JavaScript"><!--
-			// onload method call commented out as the Flash passon movie calls doRedirect
 			function redirectPage() {
 				setTimeout("doRedirect()", 1000);
 			}
@@ -63,9 +64,15 @@
 				window.location.href = url;
 			}
 			
-				//window.onload = redirectPage;
 			//-->
 		</script>
+
+		<c:if test="${not enableFlash}">
+		<script language="JavaScript" type="text/JavaScript"><!--
+			window.onload = redirectPage;
+			//-->
+		</script>
+		</c:if>
 		
 		<p><fmt:message key="message.activity.loading"/></p>