From: Harris Wong <hwong@ocad.ca>
Date: Mon, 18 Oct 2010 19:28:40 +0000 (-0000)
Subject: http://atutor.ca/atutor/mantis/view.php?id=4593
X-Git-Tag: v1.1~5
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=acontent.git;a=commitdiff_plain;h=4456423c5626ffce62189e28a908a743482eab5b

http://atutor.ca/atutor/mantis/view.php?id=4593
---

diff --git a/docs/home/classes/ContentUtility.class.php b/docs/home/classes/ContentUtility.class.php
index bc0834f..f3b66a3 100644
--- a/docs/home/classes/ContentUtility.class.php
+++ b/docs/home/classes/ContentUtility.class.php
@@ -613,10 +613,13 @@ class ContentUtility {
 			return $x;
 		}
 	
-		$output = ContentUtility::formatFinalOutput($input);
-	
+        // the following has been taken out for this: 
+        // http://atutor.ca/atutor/mantis/view.php?id=4593
+        // @date Oct 18, 2010
+        //	$output = ContentUtility::formatFinalOutput($input);
+        $output = $input;
 		$output = '<p>'.$input.'</p>';
-	
+        
 		return $output;
 	}
 	
diff --git a/docs/home/ims/include/ims_template.inc.php b/docs/home/ims/include/ims_template.inc.php
index c904ad5..88bb1fc 100644
--- a/docs/home/ims/include/ims_template.inc.php
+++ b/docs/home/ims/include/ims_template.inc.php
@@ -198,6 +198,10 @@ function print_organizations($parent_id,
 
 			/* generate the a4a files */
 			$a4a_xml_array = array();
+            //http://atutor.ca/atutor/mantis/view.php?id=4593
+            if ($content['formatting']===0){
+                $use_a4a = false;
+            }
 			if ($use_a4a == true){
 				$a4aExport = new A4aExport($content['content_id']);
 //				$a4aExport->setRelativePath('resources/'.$content['content_path']);
diff --git a/docs/home/imscc/include/ims_template.inc.php b/docs/home/imscc/include/ims_template.inc.php
index 24e5d38..d72b085 100644
--- a/docs/home/imscc/include/ims_template.inc.php
+++ b/docs/home/imscc/include/ims_template.inc.php
@@ -250,6 +250,10 @@ function print_organizations($parent_id,
 
 			/* generate the a4a files */
 			$a4a_xml_array = array();
+            //http://atutor.ca/atutor/mantis/view.php?id=4593
+            if ($content['formatting']===0){
+                $use_a4a = false;
+            }
 			if ($use_a4a == true){
 				$a4aExport = new A4aExport($content['content_id']);
 //				$a4aExport->setRelativePath('resources/'.$content['content_path']);