From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 19 May 2011 23:58:45 +0000 (+0000)
Subject: luci-0.10: merge r7082
X-Git-Tag: 0.10.0~135
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=02a06a7434ef488071c9666be90ae3cdf5f1ce12;p=oweals%2Fluci.git

luci-0.10: merge r7082
---

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index d3bec7cc9..4fe10d0ed 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -264,4 +264,4 @@ c.write = function(self, section, value)
 end
 
 
-return m, m3, m2
+return m, m3 or m2, m3 and m2