| Index: branches/wmf/1.17wmf1/includes/api/ApiQueryPageProps.php |
| — | — | @@ -108,7 +108,7 @@ |
| 109 | 109 | * @return bool True if it fits in the result |
| 110 | 110 | */ |
| 111 | 111 | private function addPageProps( $result, $page, $props ) { |
| 112 | | - $fit = $result->addValue( array( 'query', 'pages' ), $page, $props ); |
| | 112 | + $fit = $result->addValue( array( 'query', 'pages', $page ), 'pageprops', $props ); |
| 113 | 113 | |
| 114 | 114 | if ( !$fit ) { |
| 115 | 115 | $this->setContinueEnumParameter( 'continue', $page ); |
| Property changes on: branches/wmf/1.17wmf1/includes/api/ApiQueryPageProps.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 116 | 116 | Merged /trunk/phase3/includes/api/ApiQueryPageProps.php:r82297,82312,82337 |
| Index: branches/wmf/1.17wmf1/includes/specials/SpecialNewpages.php |
| — | — | @@ -366,7 +366,7 @@ |
| 367 | 367 | |
| 368 | 368 | $feed->outHeader(); |
| 369 | 369 | if( $pager->getNumRows() > 0 ) { |
| 370 | | - foreach ( $pager->mResult->fetchObject() as $row ) { |
| | 370 | + foreach ( $pager->mResult as $row ) { |
| 371 | 371 | $feed->outItem( $this->feedItem( $row ) ); |
| 372 | 372 | } |
| 373 | 373 | } |
| Index: branches/wmf/1.17wmf1/includes/specials/SpecialContributions.php |
| — | — | @@ -616,7 +616,6 @@ |
| 617 | 617 | $classes = array(); |
| 618 | 618 | |
| 619 | 619 | $page = Title::newFromRow( $row ); |
| 620 | | - $page->resetArticleId( $row->rev_page ); // use process cache |
| 621 | 620 | $link = $sk->link( |
| 622 | 621 | $page, |
| 623 | 622 | htmlspecialchars( $page->getPrefixedText() ), |
| Index: branches/wmf/1.17wmf1/RELEASE-NOTES |
| — | — | @@ -499,6 +499,8 @@ |
| 500 | 500 | * (bug 24650) Fix API to work with categorylinks changes |
| 501 | 501 | * action=parse now correctly returns an error for nonexistent pages |
| 502 | 502 | * (bug 27201) Special:WhatLinksHere output no longer contains duplicate IDs |
| | 503 | +* (bug 27479) API error when using both prop=pageprops and |
| | 504 | + prop=info&inprop=displaytitle |
| 503 | 505 | |
| 504 | 506 | * (bug 22738) Allow filtering by action type on query=logevent. |
| 505 | 507 | * (bug 22764) uselang parameter for action=parse. |
| Property changes on: branches/wmf/1.17wmf1/RELEASE-NOTES |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 506 | 508 | Merged /trunk/phase3/RELEASE-NOTES:r82297,82312,82337 |