From 34894d72e8bda61d9ac37728103f7298a6c6e47c Mon Sep 17 00:00:00 2001 From: camer0n Date: Sun, 27 Apr 2025 05:48:27 -0700 Subject: [PATCH] Issue #5481 clear update info after github update. --- e107_admin/boot.php | 6 +++--- e107_admin/db.php | 2 ++ e107_admin/update_routines.php | 5 +++++ e107_handlers/cron_class.php | 2 ++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/e107_admin/boot.php b/e107_admin/boot.php index 1fb02e2f0..8d0e393fb 100644 --- a/e107_admin/boot.php +++ b/e107_admin/boot.php @@ -80,7 +80,7 @@ if(e_AJAX_REQUEST && getperms('0') && varset($_GET['mode']) == 'addons' && ($_G $tp = e107::getParser(); $ns->setUniqueId('e-addon-updates'); $ns->setStyle('warning'); - $ret = $ns->tablerender($tp->toGlyph('fa-arrow-circle-o-down').LAN_UPDATE_AVAILABLE,$text,'default', true); + $ret = $ns->tablerender($tp->toGlyph('fa-arrow-circle-o-down').defset('LAN_UPDATE_AVAILABLE'),$text,'default', true); echo $ret; @@ -292,7 +292,7 @@ function admin_purge_related($table, $id) $num = $_com->delete_comments($table, $id); if ($num) { - $msg .= $num." ".LAN_COMMENTS." ".LAN_DELETED."
"; + $msg .= $num." ".LAN_COMMENTS." ".defset('LAN_DELETED', 'Deleted')."
"; } // Delete any related ratings @@ -301,7 +301,7 @@ function admin_purge_related($table, $id) $num = $_rate->delete_ratings($table, $id); if ($num) { - $msg .= LAN_RATING." ".LAN_DELETED."
"; + $msg .= LAN_RATING." ".defset('LAN_DELETED', 'Deleted')."
"; } if ($msg) diff --git a/e107_admin/db.php b/e107_admin/db.php index fa25df0ab..197be6898 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -422,6 +422,8 @@ class system_tools e107::getRender()->tablerender(DBLAN_10.SEP.DBLAN_112, e107::getMessage()->render()); e107::getCache()->clearAll('system'); + e107::getSession()->clear('core-update-status'); // true when the update alert should be displayed. + e107::getSession()->clear('core-update-checked'); // if the update check has been performed already or not. } diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index f30366cd1..14b686e49 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -654,6 +654,11 @@ function update_core_database($type = '') } + if(!isset($pref['admin_navbar_debug'])) + { + return update_needed("Upgrade to 2.4 required (install skin)."); + } + if(!isset($pref['lan_global_list']['news'])) { if($just_check) diff --git a/e107_handlers/cron_class.php b/e107_handlers/cron_class.php index 0eb14d215..73cd438b3 100644 --- a/e107_handlers/cron_class.php +++ b/e107_handlers/cron_class.php @@ -83,6 +83,8 @@ class _system_cron e107::getCache()->clearAll('js'); e107::getCache()->clearAll('library'); e107::getCache()->clearAll('browser'); + e107::getSession()->clear('core-update-status'); // true when the update alert should be displayed. + e107::getSession()->clear('core-update-checked'); // true if the update check has been performed already. false if not. }