Item15154: fix explicitly provided content type

foswiki · Jul 7, 2022 · be663c7 · be663c7
1 parent 289bfb3
commit be663c7
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/core/lib/Foswiki/UI/View.pm b/core/lib/Foswiki/UI/View.pm
@@ -387,17 +387,19 @@ sub view {
         $end = '';
     }
 
-    if ( $session->getSkin() =~ m/\brss/ ) {
-        $contentType = 'text/xml';
-    }
-    elsif ( $session->getSkin() =~ m/\bxml/ ) {
-        $contentType = 'text/xml';
-    }
-    elsif ( $raw eq 'text' || $raw eq 'all' ) {
-        $contentType = 'text/plain';
-    }
-    else {
-        $contentType = 'text/html';
+    unless ($contentType) {
+        if ( $session->getSkin() =~ m/\brss/ ) {
+            $contentType = 'text/xml';
+        }
+        elsif ( $session->getSkin() =~ m/\bxml/ ) {
+            $contentType = 'text/xml';
+        }
+        elsif ( $raw eq 'text' || $raw eq 'all' ) {
+            $contentType = 'text/plain';
+        }
+        else {
+            $contentType = 'text/html';
+        }
     }
     $session->{prefs}->setSessionPreferences(
         MAXREV  => $maxRev,