API: Fixed regression bug 10274: generator=watchlist complains about gwlprop even...

[lhc/web/wiklou.git] / includes / api / ApiQueryWatchlist.php

diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index f61a769..245c04a 100644 (file)
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -62,9 +62,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
                $allrev = $start = $end = $namespace = $dir = $limit = $prop = null;
                extract($this->extractRequestParams());
 
-               if (!is_null($prop)) {
-                       if (!is_null($resultPageSet))
-                               $this->dieUsage($this->encodeParamName('prop') . ' parameter may not be used in a generator', 'params');
+               if (!is_null($prop) && is_null($resultPageSet)) {
 
                        $prop = array_flip($prop);