Changeset 53226

Timestamp:

04/20/2022 05:53:25 AM (3 years ago)

Author:

peterwilsoncc

Message:

Autosave: Compare heartbeat intervals in same unit.

Move the conversion of minimalInterval to milliseconds to be grouped with the other time conversions from seconds to milliseconds.

This fixes a bug in which the minimal and main intervals were compared after the former had been converted to milliseconds but the latter had not. This could cause the heatbeat interval to blow out to unexpectedly high values if the minimal interval was set.

Props tabrisrp, sabernhardt, SergeyBiryukov, audrasjb.
Fixes #54825.

File:

• trunk/src/js/_enqueues/wp/heartbeat.js (modified) (2 diffs)

trunk/src/js/_enqueues/wp/heartbeat.js

@@ -156 +156 @@
                 if ( options.minimalInterval ) {
                     options.minimalInterval = parseInt( options.minimalInterval, 10 );
-                    settings.minimalInterval = options.minimalInterval > 0 && options.minimalInterval <= 600 ? options.minimalInterval * 1000 : 0;
+                    settings.minimalInterval = options.minimalInterval > 0 && options.minimalInterval <= 600 ? options.minimalInterval : 0;
                 }
 
@@ -177 +177 @@
             settings.mainInterval = settings.mainInterval * 1000;
             settings.originalInterval = settings.mainInterval;
+            if ( settings.minimalInterval ) {
+                settings.minimalInterval = settings.minimalInterval * 1000;
+            }
 
             /*