Skip to content

Commit 71d2a48

Browse files
committed
Update Core class
1 parent 72febae commit 71d2a48

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

system/core/Common.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ function is_really_writable($file)
139139
@unlink($file);
140140
return TRUE;
141141
}
142-
elseif ( ! is_file($file) OR ($fp = @fopen($file, 'ab')) === FALSE)
142+
143+
if ( ! is_file($file) OR ($fp = @fopen($file, 'ab')) === FALSE)
143144
{
144145
return FALSE;
145146
}
@@ -379,16 +380,15 @@ function &get_mimes()
379380
*/
380381
function is_https()
381382
{
382-
if ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')
383-
{
383+
if (! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
384384
return TRUE;
385385
}
386-
elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https')
387-
{
386+
387+
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https') {
388388
return TRUE;
389389
}
390-
elseif ( ! empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off')
391-
{
390+
391+
if (! empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
392392
return TRUE;
393393
}
394394

@@ -738,8 +738,8 @@ function _shutdown_handler()
738738
* This prevents sandwiching null characters
739739
* between ascii characters, like Java\0script.
740740
*
741-
* @param string
742-
* @param bool
741+
* @param string $str
742+
* @param bool $url_encoded
743743
* @return string
744744
*/
745745
function remove_invisible_characters($str, $url_encoded = TRUE)

system/core/Utf8.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,11 @@ public function safe_ascii_for_xml($str)
135135
*/
136136
public function convert_to_utf8($str, $encoding)
137137
{
138-
if (MB_ENABLED)
139-
{
138+
if (MB_ENABLED) {
140139
return mb_convert_encoding($str, 'UTF-8', $encoding);
141140
}
142-
elseif (ICONV_ENABLED)
143-
{
141+
142+
if (ICONV_ENABLED) {
144143
return @iconv($encoding, 'UTF-8', $str);
145144
}
146145

0 commit comments

Comments
 (0)