a value of the string type node is now valid string (it can be escaped string or cdata)

Author: Kousuke Ebihara

lib/api/opAPIMember.class.php

@@ -116,11 +116,13 @@ public function createEntryByInstance(Doctrine_Record $member, SimpleXMLElement
       if ($profile->getProfile()->isPreset())
       {
         $i18n = sfContext::getInstance()->getI18N();
-        $child = $profiles->addChild('div', $i18n->__((string)$profile));
+        $child = $profiles->addChild('div');
+        $entry->addValidStringToNode($child, $i18n->__((string)$profile));
       }
       else
       {
-        $child = $profiles->addChild('div', $profile);
+        $child = $profiles->addChild('div');
+        $entry->addValidStringToNode($child, $profile);
       }
       $child->addAttribute('id', $profile->getName());
     }

lib/api/opGDataDocument.class.php

@@ -44,12 +44,6 @@ public function publish()
     $elements = $this->getElements();
     $result = $elements->asXML();
 
-    if (Doctrine::getTable('SnsConfig')->get('op_web_api_plugin_using_cdata', false))
-    {
-      $result = preg_replace('/<content type="(.+?)">(.+?)<\/content>/ims', '<content type="$1"><![CDATA[$2]]></content>', $result, -1, $count);
-      $result = preg_replace('/<title type="(.+?)">(.+?)<\/title>/ims', '<title type="$1"><![CDATA[$2]]></title>', $result, -1, $count);
-    }
-
     return $result;
   }
 
@@ -59,4 +53,21 @@ public function getElements()
   {
     return $this->elements;
   }
+
+  public function addValidStringToNode($node, $string)
+  {
+    $domNode = dom_import_simplexml($node);
+    $doc = $domNode->ownerDocument;
+
+    if (Doctrine::getTable('SnsConfig')->get('op_web_api_plugin_using_cdata', false))
+    {
+      $child = $doc->createCDataSection($string);
+    }
+    else
+    {
+      $child = $doc->createTextNode($string);
+    }
+
+    $domNode->appendChild($child);
+  }
 }

lib/api/opGDataDocumentEntry.class.php

@@ -44,7 +44,10 @@ protected function getRootXMLString()
 
   public function setTitle($title, $type = 'text')
   {
-    $element = $this->getElements()->addChild('title', $title);
+    $element = $this->getElements()->addChild('title');
+
+    $this->addValidStringToNode($element, $title);
+
     $element->addAttribute('type', $type);
   }
 
@@ -105,7 +108,10 @@ public function setUpdated($updated)
 
   public function setContent($content, $type = 'text')
   {
-    $element = $this->getElements()->addChild('content', $content);
+    $element = $this->getElements()->addChild('content');
+
+    $this->addValidStringToNode($element, $content);
+
     $element->addAttribute('type', $type);
   }