Merge "Add phpdoc for some ApiQueryInfo properties"

[lhc/web/wiklou.git] / includes / changes / CategoryMembershipChange.php

diff --git a/includes/changes/CategoryMembershipChange.php b/includes/changes/CategoryMembershipChange.php
index 2533a5b..ab88834 100644 (file)
--- a/includes/changes/CategoryMembershipChange.php
+++ b/includes/changes/CategoryMembershipChange.php
@@ -19,8 +19,8 @@
  *
  * @file
  * @author Kai Nissen
- * @author Adam Shorland
- * @since 1.26
+ * @author Addshore
+ * @since 1.27
  */
 
 use Wikimedia\Assert\Assert;
@@ -47,7 +47,8 @@ class CategoryMembershipChange {
 
        /**
         * @var int
-        * Number of pages this WikiPage is embedded by; set by CategoryMembershipChange::setRecursive()
+        * Number of pages this WikiPage is embedded by
+        * Set by CategoryMembershipChange::checkTemplateLinks()
         */
        private $numTemplateLinks = 0;
 
@@ -166,8 +167,10 @@ class CategoryMembershipChange {
 
                # If no revision is given, the change was probably triggered by parser functions
                if ( $revision !== null ) {
-                       // TODO if no RC try again from the master DB?
                        $correspondingRc = $this->revision->getRecentChange();
+                       if ( $correspondingRc === null ) {
+                               $correspondingRc = $this->revision->getRecentChange( Revision::READ_LATEST );
+                       }
                        if ( $correspondingRc !== null ) {
                                $bot = $correspondingRc->getAttribute( 'rc_bot' ) ?: 0;
                                $ip = $correspondingRc->getAttribute( 'rc_ip' ) ?: '';
@@ -175,6 +178,7 @@ class CategoryMembershipChange {
                        }
                }
 
+               /** @var RecentChange $rc */
                $rc = call_user_func_array(
                        $this->newForCategorizationCallback,
                        array(
@@ -237,7 +241,7 @@ class CategoryMembershipChange {
         * @param int $type may be CategoryMembershipChange::CATEGORY_ADDITION
         * or CategoryMembershipChange::CATEGORY_REMOVAL
         * @param array $params
-        * - prefixedUrl: result of Title::->getPrefixedURL()
+        * - prefixedText: result of Title::->getPrefixedText()
         *
         * @return string
         */