MediaWiki 1.15.0

[autoinstalls/mediawiki.git] / includes / SquidUpdate.php

diff --git a/includes/SquidUpdate.php b/includes/SquidUpdate.php
index c8497a83ad825f1cdb79401ee495d4a55c54f3e5..b1f019241792f717de25039eec0fd46c8cc1e08c 100644 (file)
--- a/includes/SquidUpdate.php
+++ b/includes/SquidUpdate.php
@@ -52,13 +52,17 @@ class SquidUpdate {
                return new SquidUpdate( $blurlArr );
        }
 
-       static function newFromTitles( &$titles, $urlArr = array() ) {
+       /**
+        * Create a SquidUpdate from an array of Title objects, or a TitleArray object
+        */
+       static function newFromTitles( $titles, $urlArr = array() ) {
                global $wgMaxSquidPurgeTitles;
-               if ( count( $titles ) > $wgMaxSquidPurgeTitles ) {
-                       $titles = array_slice( $titles, 0, $wgMaxSquidPurgeTitles );
-               }
+               $i = 0;
                foreach ( $titles as $title ) {
                        $urlArr[] = $title->getInternalURL();
+                       if ( $i++ > $wgMaxSquidPurgeTitles ) {
+                               break;
+                       }
                }
                return new SquidUpdate( $urlArr );
        }