Commit 8ff052cb authored by Taylor Otwell's avatar Taylor Otwell

Merge pull request #1180 from unikent/master

Performance enhancement for HTML Class.
parents 6140089e f02e7dc4
...@@ -9,6 +9,13 @@ class HTML { ...@@ -9,6 +9,13 @@ class HTML {
*/ */
public static $macros = array(); public static $macros = array();
/**
* Cache application encoding locally to save expensive calls to config::get().
*
* @var string
*/
public static $encoding = null;
/** /**
* Registers a custom macro. * Registers a custom macro.
* *
...@@ -31,7 +38,7 @@ class HTML { ...@@ -31,7 +38,7 @@ class HTML {
*/ */
public static function entities($value) public static function entities($value)
{ {
return htmlentities($value, ENT_QUOTES, Config::get('application.encoding'), false); return htmlentities($value, ENT_QUOTES, static::encoding(), false);
} }
/** /**
...@@ -42,7 +49,7 @@ class HTML { ...@@ -42,7 +49,7 @@ class HTML {
*/ */
public static function decode($value) public static function decode($value)
{ {
return html_entity_decode($value, ENT_QUOTES, Config::get('application.encoding')); return html_entity_decode($value, ENT_QUOTES, static::encoding());
} }
/** /**
...@@ -55,7 +62,7 @@ class HTML { ...@@ -55,7 +62,7 @@ class HTML {
*/ */
public static function specialchars($value) public static function specialchars($value)
{ {
return htmlspecialchars($value, ENT_QUOTES, Config::get('application.encoding'), false); return htmlspecialchars($value, ENT_QUOTES, static::encoding(), false);
} }
/** /**
...@@ -431,6 +438,16 @@ class HTML { ...@@ -431,6 +438,16 @@ class HTML {
return $safe; return $safe;
} }
/**
* Get the appliction.encoding without needing to request it from Config::get() each time.
*
* @return string
*/
protected static function encoding()
{
return static::$encoding ?: static::$encoding = Config::get('application.encoding');
}
/** /**
* Dynamically handle calls to custom macros. * Dynamically handle calls to custom macros.
* *
......
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