Merge "jquery.makeCollapsible: fix jQuery memory leak"

[lhc/web/wiklou.git] / includes / ChangesList.php

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index d54e7f0..dee8bf7 100644 (file)
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -194,7 +194,7 @@ class ChangesList extends ContextSource {
                $this->rcCacheIndex = 0;
                $this->lastdate = '';
                $this->rclistOpen = false;
-               $this->getOutput()->addModules( 'mediawiki.special.changeslist' );
+               $this->getOutput()->addModuleStyles( 'mediawiki.special.changeslist' );
                return '';
        }
 
@@ -456,10 +456,15 @@ class ChangesList extends ContextSource {
 
        /**
         * Check whether to enable recent changes patrol features
+        *
+        * @deprecated since 1.22
         * @return Boolean
         */
        public static function usePatrol() {
                global $wgUser;
+
+               wfDeprecated( __METHOD__, '1.22' );
+
                return $wgUser->useRCPatrol();
        }
 
@@ -703,7 +708,14 @@ class EnhancedChangesList extends ChangesList {
                $this->rcCacheIndex = 0;
                $this->lastdate = '';
                $this->rclistOpen = false;
-               $this->getOutput()->addModules( 'mediawiki.special.changeslist' );
+               $this->getOutput()->addModuleStyles( array(
+                       'mediawiki.special.changeslist',
+                       'mediawiki.special.changeslist.enhanced',
+               ) );
+               $this->getOutput()->addModules( array(
+                       'jquery.makeCollapsible',
+                       'mediawiki.icon',
+               ) );
                return '';
        }
        /**