Bug 35034 - moved autocomment-prefix between the prefix and the arrow. Follow up...

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

diff --git a/includes/BacklinkCache.php b/includes/BacklinkCache.php
index 6715d25..c028352 100644 (file)
--- a/includes/BacklinkCache.php
+++ b/includes/BacklinkCache.php
@@ -22,7 +22,7 @@
  * @author Tim Starling
  * @copyright © 2009, Tim Starling, Domas Mituzas
  * @copyright © 2010, Max Sem
- * @copyright © 2011, Ashar Voultoiz
+ * @copyright © 2011, Antoine Musso
  */
 class BacklinkCache {
 
@@ -75,6 +75,8 @@ class BacklinkCache {
         * Serialization handler, diasallows to serialize the database to prevent
         * failures after this class is deserialized from cache with dead DB
         * connection.
+        *
+        * @return array
         */
        function __sleep() {
                return array( 'partitionCache', 'fullResultCache', 'title' );
@@ -91,6 +93,8 @@ class BacklinkCache {
 
        /**
         * Set the Database object to use
+        *
+        * @param $db DatabaseBase
         */
        public function setDB( $db ) {
                $this->db = $db;
@@ -99,7 +103,7 @@ class BacklinkCache {
        /**
         * Get the slave connection to the database
         * When non existing, will initialize the connection.
-        * @return Database object
+        * @return DatabaseBase object
         */
        protected function getDB() {
                if ( !isset( $this->db ) ) {
@@ -151,7 +155,7 @@ class BacklinkCache {
                        return $ta;
                }
 
-               // FIXME : make this a function?
+               // @todo FIXME: Make this a function?
                if ( !isset( $this->fullResultCache[$table] ) ) {
                        wfDebug( __METHOD__ . ": from DB\n" );
                        $res = $this->getDB()->select(
@@ -175,6 +179,7 @@ class BacklinkCache {
        /**
         * Get the field name prefix for a given table
         * @param $table String
+        * @return null|string
         */
        protected function getPrefix( $table ) {
                static $prefixes = array(
@@ -188,7 +193,13 @@ class BacklinkCache {
                if ( isset( $prefixes[$table] ) ) {
                        return $prefixes[$table];
                } else {
-                       throw new MWException( "Invalid table \"$table\" in " . __CLASS__ );
+                       $prefix = null;
+                       wfRunHooks( 'BacklinkCacheGetPrefix', array( $table, &$prefix ) );
+                       if( $prefix ) {
+                               return $prefix;
+                       } else {
+                               throw new MWException( "Invalid table \"$table\" in " . __CLASS__ );
+                       }
                }
        }
 
@@ -196,19 +207,30 @@ class BacklinkCache {
         * Get the SQL condition array for selecting backlinks, with a join
         * on the page table.
         * @param $table String
+        * @return array|null
         */
        protected function getConditions( $table ) {
                $prefix = $this->getPrefix( $table );
 
-               // FIXME imagelinks and categorylinks do not rely on getNamespace,
+               // @todo FIXME: imagelinks and categorylinks do not rely on getNamespace,
                // they could be moved up for nicer case statements
                switch ( $table ) {
                        case 'pagelinks':
                        case 'templatelinks':
+                               $conds = array(
+                                       "{$prefix}_namespace" => $this->title->getNamespace(),
+                                       "{$prefix}_title"     => $this->title->getDBkey(),
+                                       "page_id={$prefix}_from"
+                               );
+                               break;
                        case 'redirect':
                                $conds = array(
                                        "{$prefix}_namespace" => $this->title->getNamespace(),
                                        "{$prefix}_title"     => $this->title->getDBkey(),
+                                       $this->getDb()->makeList( array(
+                                               "{$prefix}_interwiki = ''",
+                                               "{$prefix}_interwiki is null",
+                                       ), LIST_OR ),
                                        "page_id={$prefix}_from"
                                );
                                break;
@@ -225,7 +247,10 @@ class BacklinkCache {
                                );
                                break;
                        default:
-                               throw new MWException( "Invalid table \"$table\" in " . __CLASS__ );
+                               $conds = null;
+                               wfRunHooks( 'BacklinkCacheGetConditions', array( $table, $this->title, &$conds ) );
+                               if( !$conds )
+                                       throw new MWException( "Invalid table \"$table\" in " . __CLASS__ );
                }
 
                return $conds;
@@ -253,7 +278,7 @@ class BacklinkCache {
 
        /**
         * Partition the backlinks into batches.
-        * Returns an array giving the start and end of each range. The firsti
+        * Returns an array giving the start and end of each range. The first
         * batch has a start of false, and the last batch has an end of false.
         *
         * @param $table String: the links table name
@@ -262,7 +287,7 @@ class BacklinkCache {
         */
        public function partition( $table, $batchSize ) {
 
-               // 1) try this per process cache first
+               // 1) try partition cache ... 
 
                if ( isset( $this->partitionCache[$table][$batchSize] ) ) {
                        wfDebug( __METHOD__ . ": got from partition cache\n" );
@@ -272,7 +297,7 @@ class BacklinkCache {
                $this->partitionCache[$table][$batchSize] = false;
                $cacheEntry =& $this->partitionCache[$table][$batchSize];
 
-               // 2) try full result cache
+               // 2) ... then try full result cache ...
 
                if ( isset( $this->fullResultCache[$table] ) ) {
                        $cacheEntry = $this->partitionResult( $this->fullResultCache[$table], $batchSize );