Merge "Limit the Title backlink cache to two instances."

diff --combined includes/Title.php
index cd9eb94,98961f8..1b5e21d
--- 1/includes/Title.php
--- 2/includes/Title.php
+++ b/includes/Title.php
@@@ -84,7 -84,6 +84,6 @@@ class Title 
        var $mLength = -1;                // /< The page length, 0 for special pages
        var $mRedirect = null;            // /< Is the article at this title a redirect?
        var $mNotificationTimestamp = array(); // /< Associative array of user ID -> timestamp/false
-       var $mBacklinkCache = null;       // /< Cache of links to this title
        var $mHasSubpage;                 // /< Whether a page has any subpages
        // @}
  
@@@ -4433,11 -4432,6 +4432,11 @@@
                        'rd_title' => $this->getDBkey(),
                        'rd_from = page_id'
                );
 +              if ( $this->isExternal() ) {
 +                      $where['rd_interwiki'] = $this->getInterwiki();
 +              } else {
 +                      $where[] = 'rd_interwiki = ' . $dbr->addQuotes( '' ) . ' OR rd_interwiki IS NULL';
 +              }
                if ( !is_null( $ns ) ) {
                        $where['page_namespace'] = $ns;
                }
@@@ -4482,11 -4476,8 +4481,8 @@@
         *
         * @return BacklinkCache
         */
-       function getBacklinkCache() {
-               if ( is_null( $this->mBacklinkCache ) ) {
-                       $this->mBacklinkCache = new BacklinkCache( $this );
-               }
-               return $this->mBacklinkCache;
+       public function getBacklinkCache() {
+               return BacklinkCache::get( $this );
        }
  
        /**
@@@ -4535,9 -4526,9 +4531,9 @@@
        }
  
        /**
 -       * Get the language in which the content of this page is written.
 -       * Defaults to $wgContLang, but in certain cases it can be e.g.
 -       * $wgLang (such as special pages, which are in the user language).
 +       * Get the language in which the content of this page is written in
 +       * wikitext. Defaults to $wgContLang, but in certain cases it can be
 +       * e.g. $wgLang (such as special pages, which are in the user language).
         *
         * @since 1.18
         * @return Language
@@@ -4562,29 -4553,4 +4558,29 @@@
                wfRunHooks( 'PageContentLanguage', array( $this, &$pageLang, $wgLang ) );
                return wfGetLangObj( $pageLang );
        }
 +
 +      /**
 +       * Get the language in which the content of this page is written when
 +       * viewed by user. Defaults to $wgContLang, but in certain cases it can be
 +       * e.g. $wgLang (such as special pages, which are in the user language).
 +       *
 +       * @since 1.20
 +       * @return Language
 +       */
 +      public function getPageViewLanguage() {
 +              $pageLang = $this->getPageLanguage();
 +              // If this is nothing special (so the content is converted when viewed)
 +              if ( !$this->isSpecialPage()
 +                      && !$this->isCssOrJsPage() && !$this->isCssJsSubpage()
 +                      && $this->getNamespace() !== NS_MEDIAWIKI
 +              ) {
 +                      // If the user chooses a variant, the content is actually
 +                      // in a language whose code is the variant code.
 +                      $variant = $pageLang->getPreferredVariant();
 +                      if ( $pageLang->getCode() !== $variant ) {
 +                              $pageLang = Language::factory( $variant );
 +                      }
 +              }
 +              return $pageLang;
 +      }
  }