Skip to content

S
syncEnrollments
Commit 8e055308 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge pull request #570 from AoSiX/urlencode_issue 

Change htmlentities to urlencode for link
parents af42dec0 8eae68bd
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
laravel/html.php
View file @ 8e055308
...@@ -62,7 +62,7 @@ class HTML { ...@@ -62,7 +62,7 @@ class HTML {
*/ */
public static function script($url, $attributes = array()) 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; return '<script src="'.$url.'"'.static::attributes($attributes).'></script>'.PHP_EOL;
} }
...@@ -90,7 +90,7 @@ class HTML { ...@@ -90,7 +90,7 @@ class HTML {
$attributes = $attributes + $defaults; $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; return '<link href="'.$url.'"'.static::attributes($attributes).'>'.PHP_EOL;
} }
...@@ -126,7 +126,7 @@ class HTML { ...@@ -126,7 +126,7 @@ class HTML {
*/ */
public static function link($url, $title, $attributes = array(), $https = false) 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>'; return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
} }
...@@ -157,7 +157,7 @@ class HTML { ...@@ -157,7 +157,7 @@ class HTML {
*/ */
public static function link_to_asset($url, $title, $attributes = array(), $https = null) 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>'; return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
} }
...@@ -267,7 +267,7 @@ class HTML { ...@@ -267,7 +267,7 @@ class HTML {
{ {
$attributes['alt'] = $alt; $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).'>';
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment