summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-base
diff options
context:
space:
mode:
Diffstat (limited to 'modules/luci-base')
-rw-r--r--modules/luci-base/luasrc/model/uci.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/luci-base/luasrc/model/uci.lua b/modules/luci-base/luasrc/model/uci.lua
index 34323f08b..461ba9d5a 100644
--- a/modules/luci-base/luasrc/model/uci.lua
+++ b/modules/luci-base/luasrc/model/uci.lua
@@ -3,7 +3,6 @@
local os = require "os"
local util = require "luci.util"
-local conf = require "luci.config"
local table = require "table"
@@ -148,7 +147,8 @@ function apply(self, rollback)
local _, err
if rollback then
- local timeout = tonumber(conf.apply and conf.apply.rollback or "") or 0
+ local conf = require "luci.config"
+ local timeout = tonumber(conf and conf.apply and conf.apply.rollback or "") or 0
_, err = call("apply", {
timeout = (timeout > 30) and timeout or 30,