diff options
| author | Christian Klinger | 2016-06-15 16:43:17 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-06-15 16:43:17 +0200 |
| commit | 2b18d0d0c49c3a75bd221ab86b7315f7bae98008 (patch) | |
| tree | 7d44e103224c1a79e8ccdd5d0313f76180847303 /modules-available/backup | |
| parent | small style changes (diff) | |
| parent | [sysconfignew] Move css from global file to module specific one (diff) | |
| download | slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.gz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.xz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.zip | |
Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization
Conflicts:
install/content.sql
install/schema.sql
Diffstat (limited to 'modules-available/backup')
| -rw-r--r-- | modules-available/backup/page.inc.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules-available/backup/page.inc.php b/modules-available/backup/page.inc.php index 3f2388a5..34777db8 100644 --- a/modules-available/backup/page.inc.php +++ b/modules-available/backup/page.inc.php @@ -23,7 +23,6 @@ class Page_Backup extends Page protected function doRender() { - Render::setTitle(Dictionary::translate('lang_titleBackup')); if ($this->action === 'restore') { Render::addTemplate('restore', $this->templateData); } else { @@ -51,7 +50,7 @@ class Page_Backup extends Page Util::redirect('?do=Backup'); } Header('Content-Type: application/octet-stream', true); - Header('Content-Disposition: attachment; filename=' . 'satellite-backup_v' . Database::getExpectedSchemaVersion() . '_' . date('Y.m.d-H.i.s') . '.tgz'); + Header('Content-Disposition: attachment; filename=' . 'satellite-backup_v16_' . date('Y.m.d-H.i.s') . '.tgz'); Header('Content-Length: ' . @filesize($task['data']['backupFile'])); while (!feof($fh)) { $data = fread($fh, 16000); @@ -96,7 +95,7 @@ class Page_Backup extends Page $this->templateData['mountid'] = $task['id']; $parent = $task['id']; } - EventLog::info('Creating backup, v' . Database::getExpectedSchemaVersion() . ' on ' . Property::getServerIp()); + EventLog::info('Creating backup on ' . Property::getServerIp()); // Finally run restore $task = Taskmanager::submit('BackupRestore', array( 'mode' => 'restore', |