diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2013-12-28 23:46:40 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2013-12-28 23:48:21 +0200 |
| commit | 7a13430b3715c2c61104f9a07cb62b1d85907de9 (patch) | |
| tree | b40058dbba71b46f4a4ac7f660c8ec88e1358957 /acf2 | |
| parent | 96c66a5d97280759c47b0fd8d04c3ca148306ad6 (diff) | |
| download | acf2-7a13430b3715c2c61104f9a07cb62b1d85907de9.tar.bz2 acf2-7a13430b3715c2c61104f9a07cb62b1d85907de9.tar.xz | |
model: correct ephemeral storing of computed fields
Diffstat (limited to 'acf2')
| -rw-r--r-- | acf2/model/field.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/acf2/model/field.lua b/acf2/model/field.lua index ebe35ab..8728dbb 100644 --- a/acf2/model/field.lua +++ b/acf2/model/field.lua @@ -137,9 +137,8 @@ end function M.Field:load(context) if not context.txn then return setmetatable({}, context) end - local value - if self.compute then value = self:_compute(context) end - if value == nil then value = self:_load(context) end + local value = self:_load(context) + if value == nil and self.compute then value = self:_compute(context) end if value == nil then return self.default end return value end |