From 635518eae9703ccdbf5abe8eaab90d67b864f1e4 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 5 Jun 2023 15:15:25 +0200 Subject: [PATCH 1/2] #11458 fixed visual console when setting background none --- .../include/rest-api/models/VisualConsole/Container.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/rest-api/models/VisualConsole/Container.php b/pandora_console/include/rest-api/models/VisualConsole/Container.php index 16f86884d9..edd5ea3c55 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Container.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Container.php @@ -181,7 +181,7 @@ final class Container extends Model null ); - return ($backgroundImage === 'None.png') ? null : str_replace(' ', '%20', $backgroundImage); + return ($backgroundImage === 'None.png' || $backgroundImage === null) ? null : str_replace(' ', '%20', $backgroundImage); } From d72959fa7bfe61265ff6c44ca06fc924d2388b17 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 5 Jun 2023 15:16:28 +0200 Subject: [PATCH 2/2] Revert "#11458 fixed visual console when setting background none" This reverts commit 635518eae9703ccdbf5abe8eaab90d67b864f1e4. --- .../include/rest-api/models/VisualConsole/Container.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/rest-api/models/VisualConsole/Container.php b/pandora_console/include/rest-api/models/VisualConsole/Container.php index edd5ea3c55..16f86884d9 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Container.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Container.php @@ -181,7 +181,7 @@ final class Container extends Model null ); - return ($backgroundImage === 'None.png' || $backgroundImage === null) ? null : str_replace(' ', '%20', $backgroundImage); + return ($backgroundImage === 'None.png') ? null : str_replace(' ', '%20', $backgroundImage); }