Fix form builder with model binding.

taylorotwell · taylorotwell · commit c7dd0001e0a0 · 2013-08-01T08:25:31.000-05:00
diff --git a/src/Illuminate/Html/FormBuilder.php b/src/Illuminate/Html/FormBuilder.php
@@ -618,7 +618,7 @@ protected function getCheckboxCheckedState($name, $checked)
 	{
 		if ( ! $this->oldInputIsEmpty() and is_null($this->old($name))) return false;
 
-		if (is_null($this->old($name))) return $checked;
+		if ($this->missingOldAndModel($name)) return $checked;
 
 		return (bool) $this->getValueAttribute($name);
 	}
@@ -633,11 +633,22 @@ protected function getCheckboxCheckedState($name, $checked)
 	 */
 	protected function getRadioCheckedState($name, $value, $checked)
 	{
-		if (is_null($this->old($name))) return $checked;
+		if ($this->missingOldAndModel($name)) return $checked;
 
 		return $this->getValueAttribute($name) == $value;
 	}
 
+	/**
+	 * Determine if old input or model input exists for a key.
+	 *
+	 * @param  string  $name
+	 * @return bool
+	 */
+	protected function missingOldAndModel($name)
+	{
+		return (is_null($this->old($name)) and is_null($this->getModelValueAttribute($name)));
+	}
+
 	/**
 	 * Create a HTML reset input element.
 	 *

Original file line number	Diff line number	Diff line change
`@@ -618,7 +618,7 @@ protected function getCheckboxCheckedState($name, $checked)`
`618`	`618`	`{`
`619`	`619`	`if ( ! $this->oldInputIsEmpty() and is_null($this->old($name))) return false;`
`620`	`620`
`621`		`- if (is_null($this->old($name))) return $checked;`
	`621`	`+ if ($this->missingOldAndModel($name)) return $checked;`
`622`	`622`
`623`	`623`	`return (bool) $this->getValueAttribute($name);`
`624`	`624`	`}`
`@@ -633,11 +633,22 @@ protected function getCheckboxCheckedState($name, $checked)`
`633`	`633`	`*/`
`634`	`634`	`protected function getRadioCheckedState($name, $value, $checked)`
`635`	`635`	`{`
`636`		`- if (is_null($this->old($name))) return $checked;`
	`636`	`+ if ($this->missingOldAndModel($name)) return $checked;`
`637`	`637`
`638`	`638`	`return $this->getValueAttribute($name) == $value;`
`639`	`639`	`}`
`640`	`640`
	`641`	`+ /**`
	`642`	`+ * Determine if old input or model input exists for a key.`
	`643`	`+ *`
	`644`	`+ * @param string $name`
	`645`	`+ * @return bool`
	`646`	`+ */`
	`647`	`+ protected function missingOldAndModel($name)`
	`648`	`+ {`
	`649`	`+ return (is_null($this->old($name)) and is_null($this->getModelValueAttribute($name)));`
	`650`	`+ }`
	`651`	`+`
`641`	`652`	`/**`
`642`	`653`	`* Create a HTML reset input element.`
`643`	`654`	`*`