- Avoid duplicate ID warning by only returning the value from the matching radio button

- Fix radiobuttons where the options/values were set in the template instead of sel_options

etemplate/inc/class.etemplate_widget_checkbox.inc.php

@@ -79,6 +79,11 @@ class etemplate_widget_checkbox extends etemplate_widget
 				{
 					$valid = $value;
 				}
+				elseif ( !$options && $selected_value && $value == $selected_value)
+				{
+					// Options set in template, not in sel_options
+					$valid = $selected_value;
+				}
 				elseif (!isset($valid))
 				{
 					$valid = '';	// do not overwrite value of an other radio-button of the same group (identical name)!

etemplate/js/et2_widget_radiobox.js

@@ -133,7 +133,7 @@ var et2_radiobox = et2_inputWidget.extend(
 			}
 		}, this, et2_radiobox);
 
-		return val;
+		return val == this.options.set_value ? this.options.set_value : null;
 	}
 });
 et2_register_widget(et2_radiobox, ["radio"]);