| Index: trunk/phase3/includes/api/ApiPageSet.php |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | private $mRequestedPageFields; |
| 55 | 55 | |
| 56 | 56 | public function __construct($query, $resolveRedirects = false) { |
| 57 | | - parent :: __construct($query, __CLASS__); |
| | 57 | + parent :: __construct($query, 'query'); |
| 58 | 58 | |
| 59 | 59 | $this->mAllPages = array (); |
| 60 | 60 | $this->mTitles = array(); |
| — | — | @@ -254,7 +254,9 @@ |
| 255 | 255 | break; |
| 256 | 256 | case 'revids' : |
| 257 | 257 | if($this->mResolveRedirects) |
| 258 | | - $this->dieUsage('revids may not be used with redirect resolution', 'params'); |
| | 258 | + $this->setWarning('Redirect resolution cannot be used together with the revids= parameter. '. |
| | 259 | + 'Any redirects the revids= point to have not been resolved.'); |
| | 260 | + $this->mResolveRedirects = false; |
| 259 | 261 | $this->initFromRevIDs($revids); |
| 260 | 262 | break; |
| 261 | 263 | default : |
| — | — | @@ -475,8 +477,6 @@ |
| 476 | 478 | $this->mMissingRevIDs = array_keys($remaining); |
| 477 | 479 | |
| 478 | 480 | // Populate all the page information |
| 479 | | - if($this->mResolveRedirects) |
| 480 | | - ApiBase :: dieDebug(__METHOD__, 'revids may not be used with redirect resolution'); |
| 481 | 481 | $this->initFromPageIds(array_keys($pageids)); |
| 482 | 482 | } |
| 483 | 483 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -160,6 +160,8 @@ |
| 161 | 161 | * list=search doesn't list missing pages any more |
| 162 | 162 | * (bug 15178) Added clshow to prop=categories to allow filtering for hidden/ |
| 163 | 163 | non-hidden categories |
| | 164 | +* (bug 15228) Combining revids= and redirects now throws a warning instead of an |
| | 165 | + error, and still resolves redirects generated by the generator. |
| 164 | 166 | |
| 165 | 167 | === Languages updated in 1.14 === |
| 166 | 168 | |