Merge pull request #945 from cviebrock/html-link

Allow second param of HTML::link* methods to be null
This commit is contained in:
Dayle Rees
2012-07-31 08:39:24 -07:00

View File

@@ -137,10 +137,12 @@ class HTML {
* @param bool $https
* @return string
*/
public static function link($url, $title, $attributes = array(), $https = null)
public static function link($url, $title = null, $attributes = array(), $https = null)
{
$url = URL::to($url, $https);
if (is_null($title)) $title = $url;
return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
}
@@ -152,7 +154,7 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function link_to_secure($url, $title, $attributes = array())
public static function link_to_secure($url, $title = null, $attributes = array())
{
return static::link($url, $title, $attributes, true);
}
@@ -168,7 +170,7 @@ class HTML {
* @param bool $https
* @return string
*/
public static function link_to_asset($url, $title, $attributes = array(), $https = null)
public static function link_to_asset($url, $title = null, $attributes = array(), $https = null)
{
$url = URL::to_asset($url, $https);
@@ -183,7 +185,7 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function link_to_secure_asset($url, $title, $attributes = array())
public static function link_to_secure_asset($url, $title = null, $attributes = array())
{
return static::link_to_asset($url, $title, $attributes, true);
}
@@ -207,7 +209,7 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function link_to_route($name, $title, $parameters = array(), $attributes = array())
public static function link_to_route($name, $title = null, $parameters = array(), $attributes = array())
{
return static::link(URL::to_route($name, $parameters), $title, $attributes);
}
@@ -231,7 +233,7 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function link_to_action($action, $title, $parameters = array(), $attributes = array())
public static function link_to_action($action, $title = null, $parameters = array(), $attributes = array())
{
return static::link(URL::to_action($action, $parameters), $title, $attributes);
}