X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialShortpages.php;h=e9c15e7bed2f58000d23077a1b98dc7bb9c2b14e;hb=8b220cb5b6c5d3779b20a1d59de97291ece80282;hp=a5e51134b9f9bd718d31b23404fdb81803917941;hpb=22806b0a4509e97b56fb52b387e17e3c80fb7eb2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialShortpages.php b/includes/specials/SpecialShortpages.php
index a5e51134b9..94da25d172 100644
--- a/includes/specials/SpecialShortpages.php
+++ b/includes/specials/SpecialShortpages.php
@@ -21,7 +21,9 @@
  * @ingroup SpecialPage
  */
 
-use Wikimedia\Rdbms\ResultWrapper;
+use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\IResultWrapper;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * SpecialShortpages extends QueryPage. It is used to return the shortest
@@ -40,9 +42,14 @@ class ShortPagesPage extends QueryPage {
 	}
 
 	public function getQueryInfo() {
+		$config = $this->getConfig();
+		$blacklist = $config->get( 'ShortPagesNamespaceBlacklist' );
 		$tables = [ 'page' ];
 		$conds = [
-			'page_namespace' => MWNamespace::getContentNamespaces(),
+			'page_namespace' => array_diff(
+				MediaWikiServices::getInstance()->getNamespaceInfo()->getContentNamespaces(),
+				$blacklist
+			),
 			'page_is_redirect' => 0
 		];
 		$joinConds = [];
@@ -64,13 +71,64 @@ class ShortPagesPage extends QueryPage {
 		];
 	}
 
+	public function reallyDoQuery( $limit, $offset = false ) {
+		$fname = static::class . '::reallyDoQuery';
+		$dbr = $this->getRecacheDB();
+		$query = $this->getQueryInfo();
+		$order = $this->getOrderFields();
+
+		if ( $this->sortDescending() ) {
+			foreach ( $order as &$field ) {
+				$field .= ' DESC';
+			}
+		}
+
+		$tables = isset( $query['tables'] ) ? (array)$query['tables'] : [];
+		$fields = isset( $query['fields'] ) ? (array)$query['fields'] : [];
+		$conds = isset( $query['conds'] ) ? (array)$query['conds'] : [];
+		$options = isset( $query['options'] ) ? (array)$query['options'] : [];
+		$join_conds = isset( $query['join_conds'] ) ? (array)$query['join_conds'] : [];
+
+		if ( $limit !== false ) {
+			$options['LIMIT'] = intval( $limit );
+		}
+
+		if ( $offset !== false ) {
+			$options['OFFSET'] = intval( $offset );
+		}
+
+		$namespaces = $conds['page_namespace'];
+		if ( count( $namespaces ) === 1 ) {
+			$options['ORDER BY'] = $order;
+			$res = $dbr->select( $tables, $fields, $conds, $fname,
+				$options, $join_conds
+			);
+		} else {
+			unset( $conds['page_namespace'] );
+			$options['INNER ORDER BY'] = $order;
+			$options['ORDER BY'] = [ 'value' . ( $this->sortDescending() ? ' DESC' : '' ) ];
+			$sql = $dbr->unionConditionPermutations(
+				$tables,
+				$fields,
+				[ 'page_namespace' => $namespaces ],
+				$conds,
+				$fname,
+				$options,
+				$join_conds
+			);
+			$res = $dbr->query( $sql, $fname );
+		}
+
+		return $res;
+	}
+
 	function getOrderFields() {
 		return [ 'page_len' ];
 	}
 
 	/**
 	 * @param IDatabase $db
-	 * @param ResultWrapper $res
+	 * @param IResultWrapper $res
 	 */
 	function preprocessResults( $db, $res ) {
 		$this->executeLBFromResultWrapper( $res );