Merge branch 'develop'

This commit is contained in:
Taylor Otwell 2011-07-16 10:09:42 -05:00
commit 8d232aa0df
3 changed files with 28 additions and 9 deletions

View File

@ -3,7 +3,7 @@
* Laravel - A clean and classy framework for PHP web development. * Laravel - A clean and classy framework for PHP web development.
* *
* @package Laravel * @package Laravel
* @version 1.2.0 * @version 1.2.1
* @author Taylor Otwell * @author Taylor Otwell
* @license MIT License * @license MIT License
* @link http://laravel.com * @link http://laravel.com

View File

@ -56,14 +56,7 @@ public static function query($sql, $bindings = array(), $connection = null)
foreach ($bindings as $key => &$binding) foreach ($bindings as $key => &$binding)
{ {
if (is_null($binding)) $query->bindParam($key + 1, $binding);
{
$query->bindValue($key + 1, null, \PDO::PARAM_INT);
}
else
{
$query->bindParam($key + 1, $binding);
}
} }
$result = $query->execute(); $result = $query->execute();

View File

@ -110,6 +110,19 @@ public static function input($type, $name, $value = null, $attributes = array())
return '<input'.HTML::attributes(array_merge($attributes, array('type' => $type, 'name' => $name, 'value' => $value, 'id' => static::id($name, $attributes)))).'>'.PHP_EOL; return '<input'.HTML::attributes(array_merge($attributes, array('type' => $type, 'name' => $name, 'value' => $value, 'id' => static::id($name, $attributes)))).'>'.PHP_EOL;
} }
/**
* Create a HTML text input element.
*
* @param string $name
* @param string $value
* @param array $attributes
* @return string
*/
public static function text($name, $value = null, $attributes = array())
{
return static::input('text', $name, $value, $attributes);
}
/** /**
* Create a HTML password input element. * Create a HTML password input element.
* *
@ -122,6 +135,19 @@ public static function password($name, $attributes = array())
return static::input('password', $name, null, $attributes); return static::input('password', $name, null, $attributes);
} }
/**
* Create a HTML hidden input element.
*
* @param string $name
* @param string $value
* @param array $attributes
* @return string
*/
public static function hidden($name, $value = null, $attributes = array())
{
return static::input('hidden', $name, $value, $attributes);
}
/** /**
* Create a HTML search input element. * Create a HTML search input element.
* *