Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-10-26 07:56:07 +01:00
Code Issues Packages Projects Releases Activity

Merge branch '1.8' of github.com:getgrav/grav into 1.8

Browse Source 
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2025-10-19 17:59:58 -06:00
parent 348fa04c47 52f0d5f1d7
commit 0bdde9dec2
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system/src/Grav/Common/Recovery/RecoveryManager.php
View File

@@ -303,7 +303,7 @@ class RecoveryManager
*/
private function windowPath(): string
{
return $this->rootPath . '/system/recovery.window';
return $this->userPath . '/data/recovery.window';
}
/**
@@ -403,7 +403,9 @@ class RecoveryManager
'expires_at' => $createdAt + $ttl,
];
file_put_contents($this->windowPath(), json_encode($payload, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n");
$path = $this->windowPath();
Folder::create(dirname($path));
file_put_contents($path, json_encode($payload, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n");
}
/**

12
system/src/Grav/Common/Upgrade/SafeUpgradeService.php
View File

@@ -418,9 +418,15 @@ class SafeUpgradeService
*/
public function clearRecoveryFlag(): void
{
$flag = $this->rootPath . '/user/data/recovery.flag';
if (is_file($flag)) {
@unlink($flag);
$paths = [
$this->rootPath . '/user/data/recovery.flag',
$this->rootPath . '/user/data/recovery.window',
];
foreach ($paths as $path) {
if (is_file($path)) {
@unlink($path);
}
}
}

2
system/src/Grav/Console/Gpm/UpdateCommand.php
View File

@@ -235,6 +235,8 @@ class UpdateCommand extends GpmCommand
return 1;
}
$recovery->closeUpgradeWindow();
return 0;
}