* improved script loader language support

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

diff --git a/includes/SquidUpdate.php b/includes/SquidUpdate.php
index 6a1172a..b1f0192 100644 (file)
--- a/includes/SquidUpdate.php
+++ b/includes/SquidUpdate.php
@@ -6,7 +6,7 @@
  */
 
 /**
- * @todo document
+ * Handles purging appropriate Squid URLs given a title (or titles)
  * @ingroup Cache
  */
 class SquidUpdate {
@@ -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 );
        }
@@ -151,8 +155,9 @@ class SquidUpdate {
                                        /* open the remaining sockets for this server */
                                        list($server, $port) = explode(':', $wgSquidServers[$ss]);
                                        if(!isset($port)) $port = 80;
-                                       $sockets[$so+1] = @fsockopen($server, $port, $error, $errstr, 2);
-                                       @stream_set_blocking($sockets[$so+1],false);
+                                       $socket = @fsockopen($server, $port, $error, $errstr, 2);
+                                       @stream_set_blocking($socket,false);
+                                       $sockets[] = $socket;
                                }
                                $so++;
                        }