| Index: trunk/phase3/includes/api/ApiQueryInfo.php |
| — | — | @@ -593,29 +593,27 @@ |
| 594 | 594 | private function getWatchedInfo() { |
| 595 | 595 | global $wgUser; |
| 596 | 596 | |
| 597 | | - if ( $wgUser->isAnon() || count( $this->titles ) == 0 ) { |
| | 597 | + if ( $wgUser->isAnon() || count( $this->everything ) == 0 ) { |
| 598 | 598 | return; |
| 599 | 599 | } |
| 600 | 600 | |
| 601 | 601 | $this->watched = array(); |
| 602 | 602 | $db = $this->getDB(); |
| 603 | 603 | |
| 604 | | - $lb = new LinkBatch( $this->titles ); |
| | 604 | + $lb = new LinkBatch( $this->everything ); |
| 605 | 605 | |
| 606 | 606 | $this->resetQueryParams(); |
| 607 | | - $this->addTables( array( 'page', 'watchlist' ) ); |
| 608 | | - $this->addFields( array( 'page_title', 'page_namespace' ) ); |
| | 607 | + $this->addTables( array( 'watchlist' ) ); |
| | 608 | + $this->addFields( array( 'wl_title', 'wl_namespace' ) ); |
| 609 | 609 | $this->addWhere( array( |
| 610 | | - $lb->constructSet( 'page', $db ), |
| 611 | | - 'wl_namespace=page_namespace', |
| 612 | | - 'wl_title=page_title', |
| | 610 | + $lb->constructSet( 'wl', $db ), |
| 613 | 611 | 'wl_user' => $wgUser->getID() |
| 614 | 612 | ) ); |
| 615 | 613 | |
| 616 | 614 | $res = $this->select( __METHOD__ ); |
| 617 | 615 | |
| 618 | 616 | foreach ( $res as $row ) { |
| 619 | | - $this->watched[$row->page_namespace][$row->page_title] = true; |
| | 617 | + $this->watched[$row->wl_namespace][$row->wl_title] = true; |
| 620 | 618 | } |
| 621 | 619 | } |
| 622 | 620 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -522,6 +522,7 @@ |
| 523 | 523 | * (bug 25741) Add more data to list=search's srprop |
| 524 | 524 | * (bug 25760) counter property still reported by the API when |
| 525 | 525 | $wgDisableCounters enabled |
| | 526 | +* (bug 25987) prop=info&inprop=watched now also works for missing pages |
| 526 | 527 | |
| 527 | 528 | === Languages updated in 1.17 === |
| 528 | 529 | |