| Index: branches/REL1_15/phase3/includes/api/ApiQueryBacklinks.php |
| — | — | @@ -206,6 +206,7 @@ |
| 207 | 207 | $this->extractRowInfo($row); |
| 208 | 208 | else |
| 209 | 209 | { |
| | 210 | + $this->pageMap[$row->page_namespace][$row->page_title] = $row->page_id; |
| 210 | 211 | if($row->page_is_redirect) |
| 211 | 212 | $this->redirTitles[] = Title::makeTitle($row->page_namespace, $row->page_title); |
| 212 | 213 | $resultPageSet->processDbRow($row); |
| Index: branches/REL1_15/phase3/includes/api/ApiFormatXml.php |
| — | — | @@ -89,6 +89,11 @@ |
| 90 | 90 | if ($this->mDoubleQuote) |
| 91 | 91 | $subElemContent = $this->doubleQuote($subElemContent); |
| 92 | 92 | unset ($elemValue['*']); |
| | 93 | + |
| | 94 | + // Add xml:space="preserve" to the |
| | 95 | + // element so XML parsers will leave |
| | 96 | + // whitespace in the content alone |
| | 97 | + $elemValue['xml:space'] = 'preserve'; |
| 93 | 98 | } else { |
| 94 | 99 | $subElemContent = null; |
| 95 | 100 | } |
| Index: branches/REL1_15/phase3/includes/api/ApiBase.php |
| — | — | @@ -610,7 +610,7 @@ |
| 611 | 611 | * @return mixed (allowMultiple ? an_array_of_values : a_single_value) |
| 612 | 612 | */ |
| 613 | 613 | protected function parseMultiValue($valueName, $value, $allowMultiple, $allowedValues) { |
| 614 | | - if( trim($value) === "" ) |
| | 614 | + if( trim($value) === "" && $allowMultiple) |
| 615 | 615 | return array(); |
| 616 | 616 | $sizeLimit = $this->mMainModule->canApiHighLimits() ? self::LIMIT_SML2 : self::LIMIT_SML1; |
| 617 | 617 | $valuesList = explode('|', $value, $sizeLimit + 1); |
| Property changes on: branches/REL1_15/phase3/includes/api |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 618 | 618 | - /trunk/phase3/includes/api:48813-48814,48819,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,50070,50169 |
| 619 | 619 | + /trunk/phase3/includes/api:48813-48814,48819,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,50041,50070,50169 |
| Property changes on: branches/REL1_15/phase3/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 620 | 620 | - /trunk/phase3/includes/specials:48836,48886,48892,48989,48992-48993,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,50070,50169 |
| /trunk/phase3/includes/specials/specials:48993 |
| 621 | 621 | + /trunk/phase3/includes/specials:48836,48886,48892,48989,48992-48993,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,50041,50070,50169 |
| /trunk/phase3/includes/specials/specials:48993 |
| Property changes on: branches/REL1_15/phase3/includes |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 622 | 622 | - /trunk/phase3/includes:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,50070,50169 |
| /trunk/phase3/includes/specials:48993 |
| 623 | 623 | + /trunk/phase3/includes:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,50041,50070,50169 |
| /trunk/phase3/includes/specials:48993 |
| Index: branches/REL1_15/phase3/RELEASE-NOTES |
| — | — | @@ -340,6 +340,9 @@ |
| 341 | 341 | * Fixed the circular template inclusion check, was broken when the loop |
| 342 | 342 | involved redirects. Without this, infinite recursion within the parser is |
| 343 | 343 | possible. |
| | 344 | +* (bug 18601) generator=backlinks returns invalid continue parameter |
| | 345 | +* (bug 18597) Internal error with empty generator= parameter |
| | 346 | +* (bug 18617) Add xml:space="preserve" attribute to relevant tags in XML output |
| 344 | 347 | |
| 345 | 348 | === Languages updated in 1.15 === |
| 346 | 349 | |
| Property changes on: branches/REL1_15/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 347 | 350 | - /trunk/phase3:48814,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,50070,50169 |
| 348 | 351 | + /trunk/phase3:48814,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,50041,50070,50169 |