summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrian978 <dbrian89@yahoo.com>2012-12-18 12:25:54 +0100
committerbrian978 <dbrian89@yahoo.com>2012-12-18 12:25:54 +0100
commit638a9d243065733f862761eed0fa5829409b571a (patch)
treef4fecfcccc7c954d3126d18185243c7819a80adf
parent0fb101849e53593fdceb7064f32ea5176e6eed16 (diff)
Replaced spaces with tabs for indentation and || with OR
-rw-r--r--system/core/Security.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/system/core/Security.php b/system/core/Security.php
index 8c70e85de..5ae8e653c 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -526,17 +526,17 @@ class CI_Security {
$charset = config_item('charset');
}
- do
- {
- $matches = $matches1 = 0;
+ do
+ {
+ $matches = $matches1 = 0;
- $str = html_entity_decode($str, ENT_COMPAT, $charset);
- $str = preg_replace('~&#x(0*[0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str, -1, $matches);
- $str = preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str, -1, $matches1);
- }
- while($matches || $matches1);
+ $str = html_entity_decode($str, ENT_COMPAT, $charset);
+ $str = preg_replace('~&#x(0*[0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str, -1, $matches);
+ $str = preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str, -1, $matches1);
+ }
+ while($matches OR $matches1);
- return $str;
+ return $str;
}
// --------------------------------------------------------------------