Index: lams_central/web/learner.jsp
===================================================================
diff -u -rec61f5d738bce3513b4e5204e011a68476a9c165 -ra91a7f523070940c179e47c19a3562a20579d0ab
--- lams_central/web/learner.jsp	(.../learner.jsp)	(revision ec61f5d738bce3513b4e5204e011a68476a9c165)
+++ lams_central/web/learner.jsp	(.../learner.jsp)	(revision a91a7f523070940c179e47c19a3562a20579d0ab)
@@ -9,10 +9,11 @@
 <lams:html>
 <lams:head>
 
+<c:set var="forceMobileDevToUseFlashless"><lams:Configuration key="ForceMobileDevToUseFlashless"/></c:set>
 <c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
 	
 <c:choose>
-	<c:when test="${enableFlash}">
+	<c:when test="${enableFlash && (!forceMobileDevToUseFlashless || !isMobileDevice)}">
 		<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:when>
 	<c:otherwise>