Changeset 1946

Timestamp:

04/08/11 11:14:02 (22 months ago)

Author:

matthijs

Message:

Backport r1735: Require luci.fon.spot in luci.fon.reg.getmac().

When geturl() (and thus getmac()) are used from the wizard, luci.fon.spot is
not included yet. When it is used from the dashboard, luci.fon.spot is not
included yet. This change ensures it is always included and thus also
works from the wizard.

References: #894

Files:

• branches/2.3.6/luci/libs/fon/luasrc/fon/reg.lua (modified) (1 diff)

branches/2.3.6/luci/libs/fon/luasrc/fon/reg.lua

@@ -14 +14 @@
 function getmac()
         luci.model.uci.cursor_state():get("registered", "fonreg", "registered", "1")
-        if luci.fon.spot.get_device() == "fonera20n" then
+        if require("luci.fon.spot").get_device() == "fonera20n" then
                 mac = luci.sys.net.getmac("eth0.1", "-")
         else