Fix patrolling where NP patrol isn't explicitly enabled

Hot fix! Follow-up fc5bcf1147f9

Change-Id: Iba7e70e1a1ddd9826f6e5f4022b88ccafc5f571d

diff --git a/includes/Article.php b/includes/Article.php
index c8e6ce2..ba922a4 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1054,14 +1054,14 @@ class Article implements Page {
         * @return bool
         */
        public function showPatrolFooter() {
-               global $wgUseNPPatrol, $wgEnableAPI, $wgEnableWriteAPI;
+               global $wgUseNPPatrol, $wgUseRCPatrol, $wgEnableAPI, $wgEnableWriteAPI;
 
                $outputPage = $this->getContext()->getOutput();
                $user = $this->getContext()->getUser();
                $cache = wfGetMainCache();
                $rc = false;
 
-               if ( !$this->getTitle()->quickUserCan( 'patrol', $user ) || !$wgUseNPPatrol ) {
+               if ( !$this->getTitle()->quickUserCan( 'patrol', $user ) || !( $wgUseRCPatrol || $wgUseNPPatrol ) ) {
                        // Patrolling is disabled or the user isn't allowed to
                        return false;
                }