From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 17 Jun 2009 12:57:34 +0000 (+0000)
Subject: luci-0.9: merge r4868
X-Git-Tag: 0.9.0~191
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=86306c4324878c05e062c9bd31c161fae2e2f1c0;p=oweals%2Fluci.git

luci-0.9: merge r4868
---

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 9f66f17d3..39fe16a7f 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -266,6 +266,9 @@ function action_upgrade()
 	-- previous pages should arrange the stuff as required.
 	if step == 4 then
 		if has_platform and has_image and has_support then
+			-- Mimetype text/plain
+			luci.http.prepare_content("text/plain")
+
 			-- Now invoke sysupgrade
 			local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
 			local fd = io.popen("/sbin/luci-flash %s %q" %{
diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index 3aae6fa2f..c7bacb248 100644
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -149,6 +149,9 @@ function action_upgrade()
 	-- previous pages should arrange the stuff as required.
 	if step == 4 then
 		if has_platform and has_image and has_support then
+			-- Mimetype text/plain
+			luci.http.prepare_content("text/plain")
+
 			-- Now invoke sysupgrade
 			local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
 			local fd = io.popen("/sbin/luci-flash %s %q" %{