[Stack-cvs] stack-dev/lib/XML ExportStackTwoItem.php, 1.11, 1.12 ImportStackOneItem.php, 1.25, 1.26 ImportStackTwoItem.php, 1.23, 1.24

[Simon H. <sim...@us...>]

Update of /cvsroot/stack/stack-dev/lib/XML
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28438/lib/XML

Modified Files:
	ExportStackTwoItem.php ImportStackOneItem.php 
	ImportStackTwoItem.php 
Log Message:
Merging 2.2 branch
(with some additional fixes to ensure seamless updating for version lines)

Index: ExportStackTwoItem.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/XML/ExportStackTwoItem.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ExportStackTwoItem.php	27 Aug 2009 16:23:00 -0000	1.11
--- ExportStackTwoItem.php	30 Sep 2010 16:56:16 -0000	1.12
***************
*** 208,212 ****
      {
          $node = $this->dom->createElement($title);
!         $nodeText = $this->dom->createTextNode($text);
          $node->appendChild($nodeText);
          return $node;
--- 208,212 ----
      {
          $node = $this->dom->createElement($title);
!         $nodeText = $this->dom->createTextNode(utf8_encode($text));
          $node->appendChild($nodeText);
          return $node;

Index: ImportStackTwoItem.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/XML/ImportStackTwoItem.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ImportStackTwoItem.php	16 Oct 2009 10:28:43 -0000	1.23
--- ImportStackTwoItem.php	30 Sep 2010 16:56:16 -0000	1.24
***************
*** 93,97 ****
      public function importQuestion($filename=NULL, $itemOptions=NULL, $validate=true)
      {
-         //echo $filename;
          if($filename != NULL)
          {
--- 93,96 ----

Index: ImportStackOneItem.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/XML/ImportStackOneItem.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ImportStackOneItem.php	27 Aug 2009 16:23:00 -0000	1.25
--- ImportStackOneItem.php	30 Sep 2010 16:56:16 -0000	1.26
***************
*** 109,113 ****
          if($valid == true)
          {
-             //echo 'Correct';
              $this->setDesc();
              $this->setVars();
--- 109,112 ----