Merge branch 'release/1.10.41.2'

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.10.41.2
+## 05/11/2023
+
+1. [](#improved)
+   * Fixed an issue with `lastBackup()` that caused admin dashboard to fail with an error.
+
 # v1.10.41.1
 ## 05/09/2023
 

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Admin Panel
 slug: admin
 type: plugin
-version: 1.10.41.1
+version: 1.10.41.2
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

classes/plugin/Admin.php

@@ -1439,24 +1439,26 @@ public function logEntry()
     public function lastBackup()
     {
         $backup_file = $this->grav['locator']->findResource('log://backup.log');
+        $content = null;
 
-        if (!file_exists($backup_file)) {
+        if ($backup_file) {
+            $file    = JsonFile::instance((string) $backup_file);
+            $content = $file->content() ?? null;
+        }
+
+        if (!file_exists($backup_file) || is_null($content) || !isset($content['time'])) {
             return [
                 'days'        => '∞',
                 'chart_fill'  => 100,
                 'chart_empty' => 0
             ];
         }
-        $file    = JsonFile::instance($backup_file);
-        $content = $file->content();
 
         $backup = new \DateTime();
         $backup->setTimestamp($content['time']);
         $diff = $backup->diff(new \DateTime());
-
-        $days       = $diff->days;
+        $days = $diff->days;
         $chart_fill = $days > 30 ? 100 : round($days / 30 * 100);
-
         return [
             'days'        => $days,
             'chart_fill'  => $chart_fill,