X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fapi%2FApiQueryLinks.php;h=508bdf3f9dae38fd2770bb5361bd9c67e57851e7;hp=29c0b74c37b807f6592f60c08c0b1ed6d393ed57;hb=5120937028f768749d058aa91dde82a96de0af1c;hpb=a4943f548be4cfc8f286f00fc8064ff0e377f2ba

diff --git a/includes/api/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php
index 29c0b74c37..508bdf3f9d 100644
--- a/includes/api/ApiQueryLinks.php
+++ b/includes/api/ApiQueryLinks.php
@@ -34,7 +34,7 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
 	const LINKS = 'links';
 	const TEMPLATES = 'templates';
 
-	private $table, $prefix, $helpUrl;
+	private $table, $prefix, $titlesParam, $helpUrl;
 
 	public function __construct( ApiQuery $query, $moduleName ) {
 		switch ( $moduleName ) {
@@ -87,22 +87,34 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
 
 		$this->addTables( $this->table );
 		$this->addWhereFld( $this->prefix . '_from', array_keys( $this->getPageSet()->getGoodTitles() ) );
-		$this->addWhereFld( $this->prefix . '_namespace', $params['namespace'] );
 
-		if ( !is_null( $params[$this->titlesParam] ) ) {
+		$multiNS = true;
+		$multiTitle = true;
+		if ( $params[$this->titlesParam] ) {
+			// Filter the titles in PHP so our ORDER BY bug avoidance below works right.
+			$filterNS = $params['namespace'] ? array_flip( $params['namespace'] ) : false;
+
 			$lb = new LinkBatch;
 			foreach ( $params[$this->titlesParam] as $t ) {
 				$title = Title::newFromText( $t );
 				if ( !$title ) {
 					$this->addWarning( [ 'apiwarn-invalidtitle', wfEscapeWikiText( $t ) ] );
-				} else {
+				} elseif ( !$filterNS || isset( $filterNS[$title->getNamespace()] ) ) {
 					$lb->addObj( $title );
 				}
 			}
 			$cond = $lb->constructSet( $this->prefix, $this->getDB() );
 			if ( $cond ) {
 				$this->addWhere( $cond );
+				$multiNS = count( $lb->data ) !== 1;
+				$multiTitle = count( call_user_func_array( 'array_merge', $lb->data ) ) !== 1;
+			} else {
+				// No titles so no results
+				return;
 			}
+		} elseif ( $params['namespace'] ) {
+			$this->addWhereFld( $this->prefix . '_namespace', $params['namespace'] );
+			$multiNS = count( $params['namespace'] ) !== 1;
 		}
 
 		if ( !is_null( $params['continue'] ) ) {
@@ -131,13 +143,15 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
 		if ( count( $this->getPageSet()->getGoodTitles() ) != 1 ) {
 			$order[] = $this->prefix . '_from' . $sort;
 		}
-		if ( count( $params['namespace'] ) != 1 ) {
+		if ( $multiNS ) {
 			$order[] = $this->prefix . '_namespace' . $sort;
 		}
-
-		$order[] = $this->prefix . '_title' . $sort;
-		$this->addOption( 'ORDER BY', $order );
-		$this->addOption( 'USE INDEX', $this->prefix . '_from' );
+		if ( $multiTitle ) {
+			$order[] = $this->prefix . '_title' . $sort;
+		}
+		if ( $order ) {
+			$this->addOption( 'ORDER BY', $order );
+		}
 		$this->addOption( 'LIMIT', $params['limit'] + 1 );
 
 		$res = $this->select( __METHOD__ );