Merge remote-tracking branch 'upstream/3.0.1.6' into 3.0.1.6-Gmail

This commit is contained in:
Dante
2015-11-09 14:31:55 -04:00
14 changed files with 208 additions and 261 deletions

View File

@@ -537,6 +537,12 @@ class pmDynaform
}
}
}
if (isset($json->options) && isset($json->options[0])) {
$data[$json->variable === "" ? $json->id : $json->variable] = $json->options[0]->value;
}
if (isset($json->placeholder) && $json->placeholder !== "") {
$data[$json->variable === "" ? $json->id : $json->variable] = $json->placeholder;
}
if (isset($json->defaultValue) && $json->defaultValue !== "") {
$data[$json->variable === "" ? $json->id : $json->variable] = $json->defaultValue;
}