Commit 9fd87ea6 authored by mku's avatar mku

ZP-324 #comment Merge contribution - Fix non-existing variable in wbxmldecoder.php #time 5m

git-svn-id: https://z-push.org/svn/z-push/trunk@1571 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
parent d6de0189
...@@ -436,18 +436,18 @@ class WBXMLDecoder extends WBXMLDefs { ...@@ -436,18 +436,18 @@ class WBXMLDecoder extends WBXMLDefs {
case WBXML_ENTITY: case WBXML_ENTITY:
$entity = $this->getMBUInt(); $entity = $this->getMBUInt();
$attr .= $this->entityToCharset($entity); $attr .= $this->entityToCharset($entity);
return $element; return $attr; /* fmbiete's contribution r1534, ZP-324 */
case WBXML_STR_I: case WBXML_STR_I:
$attr .= $this->getTermStr(); $attr .= $this->getTermStr();
return $element; return $attr; /* fmbiete's contribution r1534, ZP-324 */
case WBXML_LITERAL: case WBXML_LITERAL:
if($attr != "") if($attr != "")
$attributes += $this->splitAttribute($attr); $attributes += $this->splitAttribute($attr);
$attr = $this->getStringTableEntry($this->getMBUInt()); $attr = $this->getStringTableEntry($this->getMBUInt());
return $element; return $attr; /* fmbiete's contribution r1534, ZP-324 */
case WBXML_EXT_I_0: case WBXML_EXT_I_0:
case WBXML_EXT_I_1: case WBXML_EXT_I_1:
...@@ -468,7 +468,7 @@ class WBXMLDecoder extends WBXMLDefs { ...@@ -468,7 +468,7 @@ class WBXMLDecoder extends WBXMLDefs {
case WBXML_STR_T: case WBXML_STR_T:
$attr .= $this->getStringTableEntry($this->getMBUInt()); $attr .= $this->getStringTableEntry($this->getMBUInt());
return $element; return $attr; /* fmbiete's contribution r1534, ZP-324 */
case WBXML_LITERAL_A: case WBXML_LITERAL_A:
return false; return false;
...@@ -481,7 +481,7 @@ class WBXMLDecoder extends WBXMLDefs { ...@@ -481,7 +481,7 @@ class WBXMLDecoder extends WBXMLDefs {
case WBXML_OPAQUE: case WBXML_OPAQUE:
$length = $this->getMBUInt(); $length = $this->getMBUInt();
$attr .= $this->getOpaque($length); $attr .= $this->getOpaque($length);
return $element; return $attr; /* fmbiete's contribution r1534, ZP-324 */
case WBXML_LITERAL_AC: case WBXML_LITERAL_AC:
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment