Index: themes/trunk/twentyeleven-child/functions.php =================================================================== diff -u -r89 -r90 --- themes/trunk/twentyeleven-child/functions.php (.../functions.php) (revision 89) +++ themes/trunk/twentyeleven-child/functions.php (.../functions.php) (revision 90) @@ -271,22 +271,26 @@ } $nextTrigger = $hourTriggers[$timeIdx]; + $leadingZero = $nextTrigger < 10 ? '0' : ''; //Expire Cache Set Number of Times Each Day - if ($currentHour > 12 && $nextTrigger <= 12) { - //The next expiration will be on the next day, calculate the day... - $expireDay = gmdate('D, d M Y', time() + 60 * 60 * 24); + if ($timesPerDay == 1) { + if(strtotime(gmdate('D, d M Y H:i:s', time())) > strtotime(gmdate('D, d M Y', time()) . ' ' . '14:30:00')) { + // The next expiration will be on the next day, calculate the day... + $expireDay = gmdate('D, d M Y', time() + 60 * 60 * 24); + } else { + //Next expiration is today... + $expireDay = gmdate('D, d M Y', time()); + } + $expireTS = $expireDay . ' ' . '14:30:00 GMT'; } else { - //Next expiration is today... - $expireDay = gmdate('D, d M Y', time()); - } - - $leadingZero = $nextTrigger < 10 ? '0' : ''; - - if($timesPerDay == 1) { - $expireTimeStr = mt_rand(strtotime($expireDay . ' ' . '13:00:00'), strtotime($expireDay . ' ' . '15:00:00')); - $expireTS = gmdate("D, d M Y H:i:s",$expireTimeStr) . ' GMT'; - } else { + if ($currentHour > 12 && $nextTrigger <= 12) { + //The next expiration will be on the next day, calculate the day... + $expireDay = gmdate('D, d M Y', time() + 60 * 60 * 24); + } else { + //Next expiration is today... + $expireDay = gmdate('D, d M Y', time()); + } $expireTS = $expireDay . ' ' . $leadingZero . $nextTrigger . ':00:00 GMT'; }