Merge pull request #594 from greezybacon/issue/594

Disable cron during upgrade

Reviewed-By: Peter Rotich <peter@osticket.com>

include/class.cron.php

@@ -41,6 +41,10 @@ class Cron {
     }
 
     function run(){ //called by outside cron NOT autocron
+        global $ost;
+        if (!$ost || $ost->isUpgradePending())
+            return;
+
         self::MailFetcher();
         self::TicketMonitor();
         self::PurgeLogs();

scp/autocron.php

@@ -32,7 +32,7 @@ ob_start(); //Keep the image output clean. Hide our dirt.
 $sec=time()-$_SESSION['lastcroncall'];
 $caller = $thisstaff->getUserName();
 
-if($sec>180): //user can call cron once every 3 minutes.
+if($sec>180 && $ost && !$ost->isUpgradePending()): //user can call cron once every 3 minutes.
 require_once(INCLUDE_DIR.'class.cron.php');
 
 $thisstaff = null; //Clear staff obj to avoid false credit internal notes & auto-assignment