Merge branch 'release/1.10.41.1'

getgrav · May 9, 2023 · 462a952 · 462a952
2 parents 7d600ed + 35d4574
commit 462a952
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.10.41.1
+## 05/09/2023
+
+1. [](#improved)
+   * Fixed another Toolbox deprecation error for `lastBackup()`
+
 # v1.10.41
 ## 05/09/2023
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Admin Panel
 slug: admin
 type: plugin
-version: 1.10.41
+version: 1.10.41.1
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

diff --git a/classes/plugin/Admin.php b/classes/plugin/Admin.php
@@ -1438,15 +1438,17 @@ public function logEntry()
      */
     public function lastBackup()
     {
-        $file    = JsonFile::instance($this->grav['locator']->findResource('log://backup.log'));
-        $content = $file->content();
-        if (empty($content)) {
+        $backup_file = $this->grav['locator']->findResource('log://backup.log');
+
+        if (!file_exists($backup_file)) {
             return [
                 'days'        => '&infin;',
                 'chart_fill'  => 100,
                 'chart_empty' => 0
             ];
         }
+        $file    = JsonFile::instance($backup_file);
+        $content = $file->content();
 
         $backup = new \DateTime();
         $backup->setTimestamp($content['time']);