| Index: trunk/phase3/includes/api/ApiFormatXml.php |
| — | — | @@ -83,13 +83,6 @@ |
| 84 | 84 | |
| 85 | 85 | switch (gettype($elemValue)) { |
| 86 | 86 | case 'array' : |
| 87 | | - if (isset ($elemValue['_attribs'])) { |
| 88 | | - $attribValues = $elemValue['_attribs']; |
| 89 | | - unset( $elemValue['_attribs'] ); |
| 90 | | - } else { |
| 91 | | - $attribValues = null; |
| 92 | | - } |
| 93 | | - |
| 94 | 87 | if (isset ($elemValue['*'])) { |
| 95 | 88 | $subElemContent = $elemValue['*']; |
| 96 | 89 | if ($this->mDoubleQuote) |
| — | — | @@ -120,8 +113,6 @@ |
| 121 | 114 | unset ($elemValue[$subElemId]); |
| 122 | 115 | } |
| 123 | 116 | } |
| 124 | | - |
| 125 | | - $elemValue = wfArrayMerge( $attribValues, $elemValue ); // wtf |
| 126 | 117 | |
| 127 | 118 | if (is_null($subElemIndName) && !empty ($indElements)) |
| 128 | 119 | ApiBase :: dieDebug(__METHOD__, "($elemName, ...) has integer keys without _element value. Use ApiResult::setIndexedTagName()."); |
| — | — | @@ -132,7 +123,7 @@ |
| 133 | 124 | if (!is_null($subElemContent)) { |
| 134 | 125 | $this->printText($indstr . wfElement($elemName, $elemValue, $subElemContent)); |
| 135 | 126 | } elseif (empty ($indElements) && empty ($subElements)) { |
| 136 | | - $this->printText($indstr . wfElement($elemName, $elemValue)); |
| | 127 | + $this->printText($indstr . wfElement($elemName, $elemValue)); |
| 137 | 128 | } else { |
| 138 | 129 | $this->printText($indstr . wfElement($elemName, $elemValue, null)); |
| 139 | 130 | |