Avoid XML errors
authorSteven Barth <steven@midlink.org>
Fri, 12 Sep 2008 16:12:51 +0000 (16:12 +0000)
committerSteven Barth <steven@midlink.org>
Fri, 12 Sep 2008 16:12:51 +0000 (16:12 +0000)
libs/web/luasrc/http.lua
modules/admin-full/luasrc/controller/admin/system.lua
modules/admin-mini/luasrc/controller/mini/system.lua

index 6b73b94..c5a85ea 100644 (file)
@@ -192,14 +192,16 @@ end
 --- Set the mime type of following content data.
 -- @param mime Mimetype of following content
 function prepare_content(mime)
 --- Set the mime type of following content data.
 -- @param mime Mimetype of following content
 function prepare_content(mime)
-       if mime == "application/xhtml+xml" then
-               if not getenv("HTTP_ACCEPT") or
-                 not getenv("HTTP_ACCEPT"):find("application/xhtml+xml", nil, true) then
-                       mime = "text/html; charset=UTF-8"
+       if not context.headers or not context.headers["content-type"] then
+               if mime == "application/xhtml+xml" then
+                       if not getenv("HTTP_ACCEPT") or
+                         not getenv("HTTP_ACCEPT"):find("application/xhtml+xml", nil, true) then
+                               mime = "text/html; charset=UTF-8"
+                       end
+                       header("Vary", "Accept")
                end
                end
-               header("Vary", "Accept")
+               header("Content-Type", mime)
        end
        end
-       header("Content-Type", mime)
 end
 
 --- Get the RAW HTTP input source
 end
 
 --- Get the RAW HTTP input source
index 5d64336..c89c585 100644 (file)
@@ -213,6 +213,7 @@ function action_upgrade()
                end
        end
 
                end
        end
 
+       luci.http.prepare_content("text/html")
        luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
 end
 
        luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
 end
 
index 6d16ef8..8b711d5 100644 (file)
@@ -110,6 +110,7 @@ function action_upgrade()
                end
        end
 
                end
        end
 
+       luci.http.prepare_content("text/html")
        luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
 end
 
        luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
 end