Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor changes into single get_encoding() method within the HTML Class (in order to remove duplication of logic). All tests continue to pass.

This commit is contained in:
thybag 2012-09-05 09:35:54 +01:00
parent 6e44b4080a
commit a9be66d41a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
laravel/html.php
View File

@ -38,8 +38,7 @@ public static function macro($name, $macro)
*/ */
public static function entities($value) public static function entities($value)
{ {
if(static::$encoding===null) static::$encoding = Config::get('application.encoding'); return htmlentities($value, ENT_QUOTES, static::get_encoding(), false);
return htmlentities($value, ENT_QUOTES, static::$encoding, false);
} }
/** /**
@ -50,8 +49,7 @@ public static function entities($value)
*/ */
public static function decode($value) public static function decode($value)
{ {
if(static::$encoding===null) static::$encoding = Config::get('application.encoding'); return html_entity_decode($value, ENT_QUOTES, static::get_encoding());
return html_entity_decode($value, ENT_QUOTES, static::$encoding);
} }
/** /**
@ -64,8 +62,7 @@ public static function decode($value)
*/ */
public static function specialchars($value) public static function specialchars($value)
{ {
if(static::$encoding===null) static::$encoding = Config::get('application.encoding'); return htmlspecialchars($value, ENT_QUOTES, static::get_encoding(), false);
return htmlspecialchars($value, ENT_QUOTES, static::$encoding, false);
} }
/** /**
@ -417,6 +414,18 @@ protected static function obfuscate($value)
return $safe; return $safe;
} }
/**
* Get the appliction.encoding without needing to request it from Config::get() each time.
*
* @return string
*/
public static function get_encoding(){
if(static::$encoding===null) static::$encoding = Config::get('application.encoding');
return static::$encoding;
}
/** /**
* Dynamically handle calls to custom macros. * Dynamically handle calls to custom macros.
* *