Merge "Add tests for API's assert={user|bot}"

[lhc/web/wiklou.git] / includes / cache / LinkCache.php

diff --git a/includes/cache/LinkCache.php b/includes/cache/LinkCache.php
index 169816b..e80dfb3 100644 (file)
--- a/includes/cache/LinkCache.php
+++ b/includes/cache/LinkCache.php
@@ -35,7 +35,6 @@ class LinkCache {
        private $mGoodLinkFields = array();
        private $mBadLinks = array();
        private $mForUpdate = false;
-       private $useDatabase = true;
 
        /**
         * @var LinkCache
@@ -79,7 +78,7 @@ class LinkCache {
        /**
         * General accessor to get/set whether SELECT FOR UPDATE should be used
         *
-        * @param $update
+        * @param bool $update
         * @return bool
         */
        public function forUpdate( $update = null ) {
@@ -87,8 +86,8 @@ class LinkCache {
        }
 
        /**
-        * @param $title
-        * @return array|int
+        * @param string $title
+        * @return int
         */
        public function getGoodLinkID( $title ) {
                if ( array_key_exists( $title, $this->mGoodLinks ) ) {
@@ -101,9 +100,9 @@ class LinkCache {
        /**
         * Get a field of a title object from cache.
         * If this link is not good, it will return NULL.
-        * @param $title Title
+        * @param Title $title
         * @param string $field ('length','redirect','revision','model')
-        * @return mixed
+        * @return string|null
         */
        public function getGoodLinkFieldObj( $title, $field ) {
                $dbkey = $title->getPrefixedDBkey();
@@ -115,7 +114,7 @@ class LinkCache {
        }
 
        /**
-        * @param $title
+        * @param string $title
         * @return bool
         */
        public function isBadLink( $title ) {
@@ -148,8 +147,8 @@ class LinkCache {
        /**
         * Same as above with better interface.
         * @since 1.19
-        * @param $title Title
-        * @param $row object which has the fields page_id, page_is_redirect,
+        * @param Title $title
+        * @param stdClass $row Object which has the fields page_id, page_is_redirect,
         *  page_latest and page_content_model
         */
        public function addGoodLinkObjFromRow( $title, $row ) {
@@ -164,7 +163,7 @@ class LinkCache {
        }
 
        /**
-        * @param $title Title
+        * @param Title $title
         */
        public function addBadLinkObj( $title ) {
                $dbkey = $title->getPrefixedDBkey();
@@ -178,7 +177,7 @@ class LinkCache {
        }
 
        /**
-        * @param $title Title
+        * @param Title $title
         */
        public function clearLink( $title ) {
                $dbkey = $title->getPrefixedDBkey();
@@ -198,8 +197,8 @@ class LinkCache {
        /**
         * Add a title to the link cache, return the page_id or zero if non-existent
         *
-        * @param string $title title to add
-        * @return Integer
+        * @param string $title Title to add
+        * @return int
         */
        public function addLink( $title ) {
                $nt = Title::newFromDBkey( $title );
@@ -210,24 +209,11 @@ class LinkCache {
                }
        }
 
-       /**
-        * Enable or disable database use.
-        * @since 1.22
-        * @param $value Boolean
-        * @return Boolean
-        */
-       public function useDatabase( $value = null ) {
-               if ( $value !== null ) {
-                       $this->useDatabase = (bool)$value;
-               }
-               return $this->useDatabase;
-       }
-
        /**
         * Add a title to the link cache, return the page_id or zero if non-existent
         *
-        * @param $nt Title object to add
-        * @return Integer
+        * @param Title $nt Title object to add
+        * @return int
         */
        public function addLinkObj( $nt ) {
                global $wgAntiLockFlags, $wgContentHandlerUseDB;
@@ -253,10 +239,6 @@ class LinkCache {
                        return 0;
                }
 
-               if( !$this->useDatabase ) {
-                       return 0;
-               }
-
                # Some fields heavily used for linking...
                if ( $this->mForUpdate ) {
                        $db = wfGetDB( DB_MASTER );