http://atutor.ca/atutor/mantis/view.php?id=4593
authorHarris Wong <hwong@ocad.ca>
Mon, 18 Oct 2010 19:28:40 +0000 (19:28 -0000)
committerHarris Wong <hwong@ocad.ca>
Mon, 18 Oct 2010 19:28:40 +0000 (19:28 -0000)
docs/home/classes/ContentUtility.class.php
docs/home/ims/include/ims_template.inc.php
docs/home/imscc/include/ims_template.inc.php

index bc0834f..f3b66a3 100644 (file)
@@ -613,10 +613,13 @@ class ContentUtility {
                        return $x;\r
                }\r
        \r
-               $output = ContentUtility::formatFinalOutput($input);\r
-       \r
+        // the following has been taken out for this: \r
+        // http://atutor.ca/atutor/mantis/view.php?id=4593\r
+        // @date Oct 18, 2010\r
+        //     $output = ContentUtility::formatFinalOutput($input);\r
+        $output = $input;\r
                $output = '<p>'.$input.'</p>';\r
-       \r
+        \r
                return $output;\r
        }\r
        \r
index c904ad5..88bb1fc 100644 (file)
@@ -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']);
index 24e5d38..d72b085 100644 (file)
@@ -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']);