Merge "Avoid use of rollback() in WikiPage::doEditContent()"

[lhc/web/wiklou.git] / includes / deferred / SquidUpdate.php

diff --git a/includes/deferred/SquidUpdate.php b/includes/deferred/SquidUpdate.php
index 8d535b1..0e4161c 100644 (file)
--- a/includes/deferred/SquidUpdate.php
+++ b/includes/deferred/SquidUpdate.php
@@ -26,25 +26,15 @@
  * @ingroup Cache
  */
 class SquidUpdate implements DeferrableUpdate {
-       /**
-        * Collection of URLs to purge.
-        * @var array
-        */
-       protected $urlArr;
+       /** @var string[] Collection of URLs to purge */
+       protected $urls = array();
 
        /**
         * @param array $urlArr Collection of URLs to purge
         */
        public function __construct( array $urlArr ) {
-               global $wgMaxSquidPurgeTitles;
-
                // Remove duplicate URLs from list
-               $urlArr = array_unique( $urlArr );
-               if ( count( $urlArr ) > $wgMaxSquidPurgeTitles ) {
-                       // Truncate to desired maximum URL count
-                       $urlArr = array_slice( $urlArr, 0, $wgMaxSquidPurgeTitles );
-               }
-               $this->urlArr = $urlArr;
+               $this->urls = array_unique( $urlArr );
        }
 
        /**
@@ -66,6 +56,7 @@ class SquidUpdate implements DeferrableUpdate {
        /**
         * @param Title $title
         * @return SquidUpdate
+        * @deprecated 1.27
         */
        public static function newSimplePurge( Title $title ) {
                $urlArr = $title->getSquidURLs();
@@ -77,7 +68,7 @@ class SquidUpdate implements DeferrableUpdate {
         * Purges the list of URLs passed to the constructor.
         */
        public function doUpdate() {
-               self::purge( $this->urlArr );
+               self::purge( $this->urls );
        }
 
        /**
@@ -136,7 +127,7 @@ class SquidUpdate implements DeferrableUpdate {
         * @throws MWException
         * @param array $urlArr Collection of URLs to purge
         */
-       public static function HTCPPurge( $urlArr ) {
+       protected static function HTCPPurge( $urlArr ) {
                global $wgHTCPRouting, $wgHTCPMulticastTTL;
 
                // HTCP CLR operation