* Avoid PHP notice errors when doing HTTP proxy purges for an empty list

* As intended, *skip* the HTTP proxy purges when doing HTCP purges

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f500a30..2388a62 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -179,6 +179,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Escape the output of magic variables that return page name or part of it
 * (bug 10309) Initialise parser state properly in extractSections(), fixes
   some cases where section edits broke because tags were improperly stripped
+* Avoid PHP notice errors when doing HTTP proxy purges for an empty list
+* As intended, *skip* the HTTP proxy purges when doing HTCP purges
 
 
 == API changes since 1.10 ==

diff --git a/includes/SquidUpdate.php b/includes/SquidUpdate.php
index 78cac61..65c85a2 100644 (file)
--- a/includes/SquidUpdate.php
+++ b/includes/SquidUpdate.php
@@ -81,9 +81,14 @@ class SquidUpdate {
                        echo implode("<br />\n", $urlArr) . "<br />\n";
                        return;
                }*/
+               
+               if( empty( $urlArr ) ) {
+                       return;
+               }
 
-               if ( $wgHTCPMulticastAddress && $wgHTCPPort )
-                       SquidUpdate::HTCPPurge( $urlArr );
+               if ( $wgHTCPMulticastAddress && $wgHTCPPort ) {
+                       return SquidUpdate::HTCPPurge( $urlArr );
+               }
 
                $fname = 'SquidUpdate::purge';
                wfProfileIn( $fname );