From: Jo-Philipp Wich Date: Thu, 13 Feb 2014 12:06:47 +0000 (+0000) Subject: trunk: Merge fix from luci-0.11 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4ade761227383551a85f4a0b99b84d321d779fe0;p=project%2Fluci.git trunk: Merge fix from luci-0.11 --- diff --git a/modules/admin-mini/luasrc/model/cbi/mini/system.lua b/modules/admin-mini/luasrc/model/cbi/mini/system.lua index f2ab5e529c..593af04f25 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/system.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/system.lua @@ -27,8 +27,8 @@ s.addremove = false local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo() local uptime = luci.sys.uptime() -s:option(DummyValue, "_system", translate("System")).value = system -s:option(DummyValue, "_cpu", translate("Processor")).value = model +s:option(DummyValue, "_system", translate("System")).value = model +s:option(DummyValue, "_cpu", translate("Processor")).value = system local load1, load5, load15 = luci.sys.loadavg() s:option(DummyValue, "_la", translate("Load")).value =