Merge pull request laravel#570 from AoSiX/urlencode_issue

taylorotwell · taylorotwell · commit 8e05530869cc · 2012-04-24T08:41:35.000-07:00
Change htmlentities to urlencode for link
diff --git a/laravel/html.php b/laravel/html.php
@@ -62,7 +62,7 @@ public static function decode($value)
 	 */
 	public static function script($url, $attributes = array())
 	{
-		$url = static::entities(URL::to_asset($url));
+		$url = urlencode(URL::to_asset($url));
 
 		return '<script src="'.$url.'"'.static::attributes($attributes).'></script>'.PHP_EOL;
 	}
@@ -90,7 +90,7 @@ public static function style($url, $attributes = array())
 
 		$attributes = $attributes + $defaults;
 
-		$url = static::entities(URL::to_asset($url));
+		$url = urlencode(URL::to_asset($url));
 
 		return '<link href="'.$url.'"'.static::attributes($attributes).'>'.PHP_EOL;
 	}
@@ -126,7 +126,7 @@ public static function span($value, $attributes = array())
 	 */
 	public static function link($url, $title, $attributes = array(), $https = false)
 	{
-		$url = static::entities(URL::to($url, $https));
+		$url = urlencode(URL::to($url, $https));
 
 		return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
 	}
@@ -157,7 +157,7 @@ public static function link_to_secure($url, $title, $attributes = array())
 	 */
 	public static function link_to_asset($url, $title, $attributes = array(), $https = null)
 	{
-		$url = static::entities(URL::to_asset($url, $https));
+		$url = urlencode(URL::to_asset($url, $https));
 
 		return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
 	}
@@ -267,7 +267,7 @@ public static function image($url, $alt = '', $attributes = array())
 	{
 		$attributes['alt'] = $alt;
 
-		return '<img src="'.static::entities(URL::to_asset($url)).'"'.static::attributes($attributes).'>';
+		return '<img src="'.urlencode(URL::to_asset($url)).'"'.static::attributes($attributes).'>';
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public static function decode($value)`
`62`	`62`	`*/`
`63`	`63`	`public static function script($url, $attributes = array())`
`64`	`64`	`{`
`65`		`- $url = static::entities(URL::to_asset($url));`
	`65`	`+ $url = urlencode(URL::to_asset($url));`
`66`	`66`
`67`	`67`	`return '<script src="'.$url.'"'.static::attributes($attributes).'></script>'.PHP_EOL;`
`68`	`68`	`}`
`@@ -90,7 +90,7 @@ public static function style($url, $attributes = array())`
`90`	`90`
`91`	`91`	`$attributes = $attributes + $defaults;`
`92`	`92`
`93`		`- $url = static::entities(URL::to_asset($url));`
	`93`	`+ $url = urlencode(URL::to_asset($url));`
`94`	`94`
`95`	`95`	`return '<link href="'.$url.'"'.static::attributes($attributes).'>'.PHP_EOL;`
`96`	`96`	`}`
`@@ -126,7 +126,7 @@ public static function span($value, $attributes = array())`
`126`	`126`	`*/`
`127`	`127`	`public static function link($url, $title, $attributes = array(), $https = false)`
`128`	`128`	`{`
`129`		`- $url = static::entities(URL::to($url, $https));`
	`129`	`+ $url = urlencode(URL::to($url, $https));`
`130`	`130`
`131`	`131`	`return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';`
`132`	`132`	`}`
`@@ -157,7 +157,7 @@ public static function link_to_secure($url, $title, $attributes = array())`
`157`	`157`	`*/`
`158`	`158`	`public static function link_to_asset($url, $title, $attributes = array(), $https = null)`
`159`	`159`	`{`
`160`		`- $url = static::entities(URL::to_asset($url, $https));`
	`160`	`+ $url = urlencode(URL::to_asset($url, $https));`
`161`	`161`
`162`	`162`	`return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';`
`163`	`163`	`}`
`@@ -267,7 +267,7 @@ public static function image($url, $alt = '', $attributes = array())`
`267`	`267`	`{`
`268`	`268`	`$attributes['alt'] = $alt;`
`269`	`269`
`270`		`- return '<img src="'.static::entities(URL::to_asset($url)).'"'.static::attributes($attributes).'>';`
	`270`	`+ return '<img src="'.urlencode(URL::to_asset($url)).'"'.static::attributes($attributes).'>';`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`/**`