Merge "(bug 43915) Implement deleteEqualMessages.php"

[lhc/web/wiklou.git] / includes / job / jobs / HTMLCacheUpdateJob.php

diff --git a/includes/job/jobs/HTMLCacheUpdateJob.php b/includes/job/jobs/HTMLCacheUpdateJob.php
index 55c9f99..20245b3 100644 (file)
--- a/includes/job/jobs/HTMLCacheUpdateJob.php
+++ b/includes/job/jobs/HTMLCacheUpdateJob.php
@@ -236,19 +236,13 @@ class HTMLCacheUpdateJob extends Job {
                                array( 'page_id' => $batch ) + $touchedCond,
                                __METHOD__
                        );
-                       # WM patch: throttle to avoid apache CPU exhaustion -- TS
-                       if ( php_sapi_name() == 'cli' ) {
-                               sleep( 1 );
-                       }
                }
 
-               # Disable this as a temporary measure per private-l post -- TS
                # Update squid
-               /*
                if ( $wgUseSquid ) {
                        $u = SquidUpdate::newFromTitles( $titleArray );
                        $u->doUpdate();
-               } */
+               }
 
                # Update file cache
                if  ( $wgUseFileCache ) {