mirror of
https://github.com/getgrav/grav.git
synced 2026-07-16 14:53:10 +02:00
Merge branch 'develop' of github.com:getgrav/grav into 1.7
Conflicts: system/src/Grav/Common/Backup/Backups.php
This commit is contained in:
@@ -105,7 +105,7 @@ class Backups
|
||||
public function getBackupDownloadUrl($backup, $base_url)
|
||||
{
|
||||
$param_sep = $param_sep = Grav::instance()['config']->get('system.param_sep', ':');
|
||||
$download = urlencode(base64_encode($backup));
|
||||
$download = urlencode(base64_encode(basename($backup)));
|
||||
$url = rtrim(Grav::instance()['uri']->rootUrl(true), '/') . '/' . trim(
|
||||
$base_url,
|
||||
'/'
|
||||
|
||||
Reference in New Issue
Block a user