X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-base%2Fluasrc%2Fmodel%2Fuci.lua;h=461ba9d5a38efae2c042829dce83d5aaeec13749;hp=34323f08bd1d8657e6b130e82d5c22f7d4d830e9;hb=9ed48ef2a62df5406c589ef9a43da51df8d9645c;hpb=72fe5dd70335a6bbbe5db8ecc1885a68d368eb3a;ds=sidebyside

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,