actually override createElement to support the escaping

diff --git a/include/cbsm/util/document.php-class b/include/cbsm/util/document.php-class
index c64d9a4a81c3f6e501036f9136beeca86bc4e962..d023c997d781afeafe809a6ad6e4fb8a5259cd5d 100755 (executable)
--- a/include/cbsm/util/document.php-class
+++ b/include/cbsm/util/document.php-class
@@ -199,10 +199,7 @@ class ExtendedDocument extends DOMDocument {
   }
 
   function appendElement($name, $value = '') {
-    // Adding the $value in createElement does NOT escape it, so use appendText to support that.
-    $aelem = $this->appendChild($this->createElement($name));
-    $aelem->appendText($value);
-    return $aelem;
+    return $this->appendChild($this->createElement($name, $value));
   }
   function appendElementXML($name, $xmldata) {
     $aelem = $this->appendChild($this->createElement($name));
@@ -290,9 +287,15 @@ class ExtendedDocument extends DOMDocument {
     }
   }
 
+  function createElement($name, $value = '') {
+    // Adding the $value in DOMDocument's createElement does NOT escape it, so override it and use appendText to support that.
+    $aelem = parent::createElement($name);
+    $aelem->appendText($value);
+    return $aelem;
+  }
+
   function createElementLink($target, $value = '') {
-    $link = $this->createElement('a');
-    $link->appendText($value);
+    $link = $this->createElement('a', $value);
     $link->setAttribute('href', $target); // XXX: take care of & etc. in links
     return $link;
   }
@@ -541,10 +544,7 @@ class ExtendedElement extends DOMElement {
   //     returns the new child
 
   function appendElement($name, $value = '') {
-    // Adding the $value in createElement does NOT escape it, so use appendText to support that.
-    $aelem = $this->appendChild($this->ownerDocument->createElement($name));
-    $aelem->appendText($value);
-    return $aelem;
+    return $this->appendChild($this->ownerDocument->createElement($name, $value));
   }
   function appendElementXML($name, $xmldata) {
     $aelem = $this->appendChild($this->ownerDocument->createElement($name));
@@ -722,10 +722,7 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
   //     returns the new child
 
   function appendElement($name, $value = '') {
-    // Adding the $value in createElement does NOT escape it, so use appendText to support that.
-    $aelem = $this->appendChild($this->ownerDocument->createElement($name));
-    $aelem->appendText($value);
-    return $aelem;
+    return $this->appendChild($this->ownerDocument->createElement($name, $value));
   }
   function appendElementXML($name, $xmldata) {
     $aelem = $this->appendChild($this->ownerDocument->createElement($name));