(bug 18263) Escape single-quotes for wpDestForm

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

diff --git a/includes/LinkBatch.php b/includes/LinkBatch.php
index 90ed33a..d9a9666 100644 (file)
--- a/includes/LinkBatch.php
+++ b/includes/LinkBatch.php
@@ -4,7 +4,7 @@
  * Class representing a list of titles
  * The execute() method checks them all for existence and adds them to a LinkCache object
  *
- * @addtogroup Cache
+ * @ingroup Cache
  */
 class LinkBatch {
        /**
@@ -64,7 +64,7 @@ class LinkBatch {
         * Return an array mapping PDBK to ID
         */
         public function execute() {
-               $linkCache =& LinkCache::singleton();
+               $linkCache = LinkCache::singleton();
                return $this->executeInto( $linkCache );
         }
 
@@ -82,8 +82,8 @@ class LinkBatch {
 
        /**
         * Add a ResultWrapper containing IDs and titles to a LinkCache object.
-        * As normal, titles will go into the static Title cache field. 
-        * This function *also* stores extra fields of the title used for link 
+        * As normal, titles will go into the static Title cache field.
+        * This function *also* stores extra fields of the title used for link
         * parsing to avoid extra DB queries.
         */
        public function addResultToCache( $cache, $res ) {
@@ -134,7 +134,7 @@ class LinkBatch {
                $sql = "SELECT page_id, page_namespace, page_title, page_len, page_is_redirect FROM $page WHERE $set";
 
                // Do query
-               $res = new ResultWrapper( $dbr,  $dbr->query( $sql, __METHOD__ ) );
+               $res = $dbr->query( $sql, __METHOD__ );
                wfProfileOut( __METHOD__ );
                return $res;
        }
@@ -160,7 +160,7 @@ class LinkBatch {
                        } else {
                                $sql .= ' OR ';
                        }
-                       
+
                        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=".
@@ -168,7 +168,7 @@ class LinkBatch {
                                        ")";
                        } else {
                                $sql .= "({$prefix}_namespace=$ns AND {$prefix}_title IN (";
-                               
+
                                $firstTitle = true;
                                foreach( $dbkeys as $dbkey => $unused ) {
                                        if ( $firstTitle ) {
@@ -189,5 +189,3 @@ class LinkBatch {
                }
        }
 }
-
-