ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing bugs and refactoring.

Browse Source
This commit is contained in:
Taylor Otwell
2011-10-15 22:38:43 -05:00
parent b40e69c47a
commit a7e98e8e9a
7 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
laravel/form.php
View File

@@ -43,7 +43,9 @@ class Form {
*/
public static function open($action = null, $method = 'POST', $attributes = array(), $https = false)
{
list($attributes['action'], $attributes['method']) = array(static::action($action, $https), static::method($method));
$attributes['action'] = static::action($action, $https);
$attributes['method'] = static::method($method);
if ( ! array_key_exists('accept-charset', $attributes))
{
@@ -433,7 +435,9 @@ class Form {
*/
protected static function checkable($type, $name, $value, $checked, $attributes)
{
$attributes = array_merge($attributes, array('id' => static::id($name, $attributes), 'checked' => ($checked) ? 'checked' : null));
if ($checked) $attributes['checked'] = 'checked';
$attributes['id'] = static::id($name, $attributes);
return static::input($type, $name, $value, $attributes);
}
@@ -508,9 +512,15 @@ class Form {
*/
protected static function id($name, $attributes)
{
if (array_key_exists('id', $attributes)) return $attributes['id'];
if (array_key_exists('id', $attributes))
{
return $attributes['id'];
}
if (in_array($name, static::$labels)) return $name;
if (in_array($name, static::$labels))
{
return $name;
}
}
}