summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-02-22 20:02:50 +0000
committerTed Trask <ttrask01@yahoo.com>2012-02-22 20:02:50 +0000
commit5dd6e6c5e5c6f5dc14315bae74e26421f1a9d197 (patch)
treec8213034363b1dccf6fbfac2e6e4f85cc21e7440
parent3cb42e2c39d20d4dc7d0c8b294b883c39e837963 (diff)
downloadacf-core-5dd6e6c5e5c6f5dc14315bae74e26421f1a9d197.tar.bz2
acf-core-5dd6e6c5e5c6f5dc14315bae74e26421f1a9d197.tar.xz
Make handle_form a little smarter about overriding form options from the model
-rw-r--r--lib/controllerfunctions.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/controllerfunctions.lua b/lib/controllerfunctions.lua
index 9c9af31..ee10a14 100644
--- a/lib/controllerfunctions.lua
+++ b/lib/controllerfunctions.lua
@@ -92,8 +92,8 @@ function handle_form(self, getFunction, setFunction, clientdata, option, label,
end
form.type = "form"
- form.option = option
- form.label = label
+ form.option = option or form.option
+ form.label = label or form.label
return form
end