Merge "Fix EnhancedChangesList::getDiffHistLinks null exception"

diff --combined includes/changes/EnhancedChangesList.php
index 1a2da1a,7e59882..b34a33f
--- 1/includes/changes/EnhancedChangesList.php
--- 2/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@@ -32,11 -32,6 +32,11 @@@ class EnhancedChangesList extends Chang
         */
        protected $rc_cache;
  
 +      /**
 +       * @var TemplateParser
 +       */
 +      protected $templateParser;
 +
        /**
         * @param IContextSource|Skin $obj
         * @param array $filterGroups Array of ChangesListFilterGroup objects (currently optional)
@@@ -63,7 -58,6 +63,7 @@@
                        $this->message,
                        $this->linkRenderer
                );
 +              $this->templateParser = new TemplateParser();
        }
  
        /**
@@@ -346,7 -340,8 +346,7 @@@
  
                $this->rcCacheIndex++;
  
 -              $templateParser = new TemplateParser();
 -              return $templateParser->processTemplate(
 +              return $this->templateParser->processTemplate(
                        'EnhancedChangesListGroup',
                        $templateParams
                );
@@@ -717,6 -712,11 +717,11 @@@
                if ( $rc->getAttribute( 'rc_type' ) == RC_CATEGORIZE ) {
                        // For categorizations we must swap the category title with the page title!
                        $pageTitle = Title::newFromID( $rc->getAttribute( 'rc_cur_id' ) );
+                       if ( !$pageTitle ) {
+                               // The page has been deleted, but the RC entry
+                               // deletion job has not run yet. Just skip.
+                               return '';
+                       }
                }
  
                $retVal = ' ' . $this->msg( 'parentheses' )