API: Standardize limits. Use ApiBase constants to avoid similar breakage and inconsis...

[lhc/web/wiklou.git] / includes / LinkBatch.php

diff --git a/includes/LinkBatch.php b/includes/LinkBatch.php
index fe97d58..db1114c 100644 (file)
--- a/includes/LinkBatch.php
+++ b/includes/LinkBatch.php
@@ -3,9 +3,8 @@
 /**
  * Class representing a list of titles
  * The execute() method checks them all for existence and adds them to a LinkCache object
- +
- * @package MediaWiki
- * @subpackage Cache
+ *
+ * @addtogroup Cache
  */
 class LinkBatch {
        /**
@@ -35,7 +34,7 @@ class LinkBatch {
                        $this->data[$ns] = array();
                }
 
-               $this->data[$ns][$dbkey] = 1;
+               $this->data[$ns][str_replace( ' ', '_', $dbkey )] = 1;
        }
 
        /**
@@ -120,7 +119,7 @@ class LinkBatch {
 
                // Construct query
                // This is very similar to Parser::replaceLinkHolders
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE );
                $page = $dbr->tableName( 'page' );
                $set = $this->constructSet( 'page', $dbr );
                if ( $set === false ) {
@@ -157,19 +156,26 @@ class LinkBatch {
                        } else {
                                $sql .= ' OR ';
                        }
-                       $sql .= "({$prefix}_namespace=$ns AND {$prefix}_title IN (";
-
-                       $firstTitle = true;
-                       foreach( $dbkeys as $dbkey => $unused ) {
-                               if ( $firstTitle ) {
-                                       $firstTitle = false;
-                               } else {
-                                       $sql .= ',';
+                       
+                       if (count($dbkeys)==1) { // avoid multiple-reference syntax if simple equality can be used
+                               $singleKey = array_keys($dbkeys);
+                               $sql .= "({$prefix}_namespace=$ns AND {$prefix}_title=".
+                                       $db->addQuotes($singleKey[0]).
+                                       ")";
+                       } else {
+                               $sql .= "({$prefix}_namespace=$ns AND {$prefix}_title IN (";
+                               
+                               $firstTitle = true;
+                               foreach( $dbkeys as $dbkey => $unused ) {
+                                       if ( $firstTitle ) {
+                                               $firstTitle = false;
+                                       } else {
+                                               $sql .= ',';
+                                       }
+                                       $sql .= $db->addQuotes( $dbkey );
                                }
-                               $sql .= $db->addQuotes( $dbkey );
+                               $sql .= '))';
                        }
-
-                       $sql .= '))';
                }
                if ( $first && $firstTitle ) {
                        # No titles added
@@ -180,4 +186,4 @@ class LinkBatch {
        }
 }
 
-?>
+