Merge pull request #6053 from zeroadam/CoreRenderer

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 5604cd5aa387da0fd122aec4f1c4fc40f144acbd..272b97a8879d3495aa259f51c7b0ab4d847cb0ff 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -17,6 +17,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
+use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
@@ -865,10 +866,10 @@ function admin_page_summary(App $a)
                }
        }
 
-       if (Config::get('system', 'dbupdate', DB_UPDATE_NOT_CHECKED) == DB_UPDATE_NOT_CHECKED) {
+       if (Config::get('system', 'dbupdate', DBStructure::UPDATE_NOT_CHECKED) == DBStructure::UPDATE_NOT_CHECKED) {
                DBStructure::update(false, true);
        }
-       if (Config::get('system', 'dbupdate') == DB_UPDATE_FAILED) {
+       if (Config::get('system', 'dbupdate') == DBStructure::UPDATE_FAILED) {
                $showwarning = true;
                $warningtext[] = L10n::t('The database update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear.');
        }
@@ -1596,7 +1597,8 @@ function admin_page_dbsync(App $a)
                $retval = DBStructure::update(false, true);
                if ($retval === '') {
                        $o .= L10n::t("Database structure update %s was successfully applied.", DB_UPDATE_VERSION) . "<br />";
-                       Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, 'success');
+                       Config::set('database', 'last_successful_update', DB_UPDATE_VERSION);
+                       Config::set('database', 'last_successful_update_time', time());
                } else {
                        $o .= L10n::t("Executing of database structure update %s failed with error: %s", DB_UPDATE_VERSION, $retval) . "<br />";
                }
@@ -1613,9 +1615,9 @@ function admin_page_dbsync(App $a)
                if (function_exists($func)) {
                        $retval = $func();
 
-                       if ($retval === UPDATE_FAILED) {
+                       if ($retval === Update::FAILED) {
                                $o .= L10n::t("Executing %s failed with error: %s", $func, $retval);
-                       } elseif ($retval === UPDATE_SUCCESS) {
+                       } elseif ($retval === Update::SUCCESS) {
                                $o .= L10n::t('Update %s was successfully applied.', $func);
                                Config::set('database', $func, 'success');
                        } else {