mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

Hide other dashboard alerts until upgrade is complete.

Browse Source
This commit is contained in:
Cameron
2017-01-04 18:14:15 -08:00
parent 6e68aaa9a4
commit 1268b35f49
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
e107_admin/admin.php
View File

@@ -103,6 +103,7 @@ class admin_start
private $allowed_types = null; private $allowed_types = null;
private $refresh = false; private $refresh = false;
private $exit = false;
private $deprecated = array(); private $deprecated = array();
@@ -147,14 +148,23 @@ class admin_start
$this->deleteDeprecated(); $this->deleteDeprecated();
} }
e107::getDb()->db_Mark_Time('Check New Install');
$this->checkNewInstall();
e107::getDb()->db_Mark_Time('Check Core Update'); e107::getDb()->db_Mark_Time('Check Core Update');
$this->checkCoreUpdate(); $this->checkCoreUpdate();
if($this->exit === true)
{
return null;
}
e107::getDb()->db_Mark_Time('Check New Install');
$this->checkNewInstall();
e107::getDb()->db_Mark_Time('Check Plugin Update'); e107::getDb()->db_Mark_Time('Check Plugin Update');
$this->checkPluginUpdate(); $this->checkPluginUpdate();
e107::getDb()->db_Mark_Time('Check Theme Update'); e107::getDb()->db_Mark_Time('Check Theme Update');
$this->checkThemeUpdate(); $this->checkThemeUpdate();
e107::getDb()->db_Mark_Time('Check Paths'); e107::getDb()->db_Mark_Time('Check Paths');
$this->checkPaths(); $this->checkPaths();
e107::getDb()->db_Mark_Time('Check Timezone'); e107::getDb()->db_Mark_Time('Check Timezone');
@@ -238,7 +248,14 @@ class admin_start
global $dbupdate, $dbupdatep, $e107cache; global $dbupdate, $dbupdatep, $e107cache;
require_once(e_ADMIN.'update_routines.php'); require_once(e_ADMIN.'update_routines.php');
update_check();
if(update_check() === true)
{
if(e_DEBUG !== true)
{
$this->exit = true;
}
}

4
e107_admin/update_routines.php
View File

@@ -437,7 +437,11 @@ function update_check()
// $text = ADLAN_120. "<a class='btn btn-xs btn-inline' href='".e_ADMIN_ABS."e107_update.php'>". e107::getParser()->toGlyph('fa-chevron-circle-right')."</a>"; // $text = ADLAN_120. "<a class='btn btn-xs btn-inline' href='".e_ADMIN_ABS."e107_update.php'>". e107::getParser()->toGlyph('fa-chevron-circle-right')."</a>";
// $text .= "<hr />"; // $text .= "<hr />";
$mes->addInfo($text); $mes->addInfo($text);
} }
return $update_needed;
} }