Merge branch 'develop' into 'develop'

Till Brehm · Till Brehm · commit 0c43c066f08c · 2024-04-23T10:49:56.000Z
Fix access of non existing variable backup.inc.php

See merge request ispconfig/ispconfig3!1884
diff --git a/server/lib/classes/backup.inc.php b/server/lib/classes/backup.inc.php
@@ -448,7 +448,7 @@ public static function restoreBackupWebFiles($backup_format, $password, $backup_
                 }
             }
         } else {
-            $app->log('Failed to restore web backup ' . $full_filename . ', backup mode "' . $backup_mode . '" not recognized.', LOGLEVEL_DEBUG);
+            $app->log('Failed to restore web backup ' . $filename . ', backup mode "' . $backup_mode . '" not recognized.', LOGLEVEL_DEBUG);
         }
         $app->system->web_folder_protection($web_root, true);
         return $result;

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ public static function restoreBackupWebFiles($backup_format, $password, $backup_`
`448`	`448`	`}`
`449`	`449`	`}`
`450`	`450`	`} else {`
`451`		`- $app->log('Failed to restore web backup ' . $full_filename . ', backup mode "' . $backup_mode . '" not recognized.', LOGLEVEL_DEBUG);`
	`451`	`+ $app->log('Failed to restore web backup ' . $filename . ', backup mode "' . $backup_mode . '" not recognized.', LOGLEVEL_DEBUG);`
`452`	`452`	`}`
`453`	`453`	`$app->system->web_folder_protection($web_root, true);`
`454`	`454`	`return $result;`