delete theme asset upon theme deletion, allow activation regardless of other themes state and some small touchups, fixes #6244biest-6244

2 files changed, 10 insertions, 6 deletions

diff --git a/lib/classes/JsonApi/Routes/Themes/ThemesUpdate.php b/lib/classes/JsonApi/Routes/Themes/ThemesUpdate.php
index 751b0d0..c1fcc6b 100644
--- a/lib/classes/JsonApi/Routes/Themes/ThemesUpdate.php
+++ b/lib/classes/JsonApi/Routes/Themes/ThemesUpdate.php
@@ -35,13 +35,17 @@ class ThemesUpdate extends JsonApiController
         if (self::arrayGet($json, 'data.attributes.active') === true) {
             $activeThemes = \Theme::getActiveThemes();
             foreach ($activeThemes as $theme) {
-                if ($theme->id !== $resource->id && $theme->type === $resource->type) {
+                if (
+                    $theme->id !== $resource->id
+                    && $theme->type === $resource->type
+                ) {
                     $theme->active = false;
                     $theme->store();
-                    $resource->active = true;
-                    $resource->store();
                 }
             }
+
+            $resource->active = true;
+            $resource->store();
         }
 
         return $this->getContentResponse($resource);
@@ -77,10 +81,10 @@ class ThemesUpdate extends JsonApiController
                 $resource->$sormKey = $val;
             }
         }
-        
+
         $resource->store();
 
         return $resource;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/classes/PageLayout.php b/lib/classes/PageLayout.php
index c529fa6..17ddf76 100644
--- a/lib/classes/PageLayout.php
+++ b/lib/classes/PageLayout.php
@@ -147,7 +147,7 @@ class PageLayout
             $old_base = URLHelper::setBaseURL($GLOBALS['ABSOLUTE_URI_STUDIP']);
             self::addHeadElement('link', [
                 'rel' => 'stylesheet',
-                'href' => Theme::getDownloadURL(),
+                'href' => URLHelper::getLink(Theme::getDownloadURL(), [], true),
             ]);
             URLHelper::setBaseURL($old_base);
         } catch (Exception) {