diff options
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 18 |
1 files changed, 5 insertions, 13 deletions
@@ -44,10 +44,10 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.9' ); +define ( 'STD_VERSION', '1.11' ); define ( 'ZOT_REVISION', '1.1' ); -define ( 'DB_UPDATE_VERSION', 1179 ); +define ( 'DB_UPDATE_VERSION', 1180 ); /** @@ -1703,7 +1703,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) { '$logout' => t('Logout'), '$login' => t('Login'), '$form_id' => $form_id, - '$lname' => array('username', t('Email') , '', ''), + '$lname' => array('username', t('Login/Email') , '', ''), '$lpassword' => array('password', t('Password'), '', ''), '$remember_me' => array('remember_me', t('Remember me'), '', '',array(t('No'),t('Yes'))), '$hiddens' => $hiddens, @@ -2457,24 +2457,16 @@ function check_cron_broken() { set_config('system','lastcroncheck',datetime_convert()); return; } - $t = get_config('system','lastcroncheck'); - if($t === false) { - // This is serious. Config storage isn't working. - // We just set lastcroncheck. The system is horked. - // However don't add insult to injury by sending an email - // to the admin every time a page is accessed. - // just quietly - return; - } if($t > datetime_convert('UTC','UTC','now - 3 days')) { // Wait for 3 days before we do anything so as not to swamp the admin with messages return; } + set_config('system','lastcroncheck',datetime_convert()); + if(($d) && ($d > datetime_convert('UTC','UTC','now - 3 days'))) { // Scheduled tasks have run successfully in the last 3 days. - set_config('system','lastcroncheck',datetime_convert()); return; } |