diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-10-27 17:48:28 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-10-27 17:48:28 +0200 |
commit | 8113c0f0143ed94e311f5c0fafa7ba07fd2a5c59 (patch) | |
tree | a9a3a81ae3f970e399d35a7ccc15093c39be7549 /system/core | |
parent | b9fe7e9be099f450747de6ed28d400764ffc58b3 (diff) | |
parent | 3bb4029bbe0db9625be21e2dad82ef18286560ca (diff) |
Merge pull request #1935 from vkeranov/develop
Remove some extra new lines
Diffstat (limited to 'system/core')
-rw-r--r-- | system/core/CodeIgniter.php | 1 | ||||
-rw-r--r-- | system/core/Input.php | 1 | ||||
-rw-r--r-- | system/core/Lang.php | 1 | ||||
-rw-r--r-- | system/core/Output.php | 3 | ||||
-rw-r--r-- | system/core/URI.php | 3 | ||||
-rw-r--r-- | system/core/Utf8.php | 1 |
6 files changed, 2 insertions, 8 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 324b4d849..f27086386 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -232,7 +232,6 @@ return CI_Controller::get_instance(); } - if (file_exists(APPPATH.'core/'.$CFG->config['subclass_prefix'].'Controller.php')) { require APPPATH.'core/'.$CFG->config['subclass_prefix'].'Controller.php'; diff --git a/system/core/Input.php b/system/core/Input.php index 18406fe43..f6213c34e 100644 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -209,7 +209,6 @@ class CI_Input { return $this->_fetch_from_array($_POST, $index, $xss_clean); } - // -------------------------------------------------------------------- /** diff --git a/system/core/Lang.php b/system/core/Lang.php index e74304dd9..251cf6ef1 100644 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -120,7 +120,6 @@ class CI_Lang { } } - if ( ! isset($lang) OR ! is_array($lang)) { log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile); diff --git a/system/core/Output.php b/system/core/Output.php index 3f2f84fa1..e969ba899 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -382,10 +382,9 @@ class CI_Output { $output = $this->minify($output, $this->mime_type); } - // -------------------------------------------------------------------- - // Do we need to write a cache file? Only if the controller does not have its + // Do we need to write a cache file? Only if the controller does not have its // own _output() method and we are not dealing with a cache file, which we // can determine by the existence of the $CI object above if ($this->cache_expiration > 0 && isset($CI) && ! method_exists($CI, '_output')) diff --git a/system/core/URI.php b/system/core/URI.php index 13530bd63..33f7d21fa 100644 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -473,7 +473,7 @@ class CI_URI { $segments = array_slice($this->$segment_array(), ($n - 1)); $i = 0; $lastval = ''; - $retval = array(); + $retval = array(); foreach ($segments as $seg) { if ($i % 2) @@ -640,7 +640,6 @@ class CI_URI { return $this->uri_string; } - // -------------------------------------------------------------------- /** diff --git a/system/core/Utf8.php b/system/core/Utf8.php index bc7afed91..efe3c10dc 100644 --- a/system/core/Utf8.php +++ b/system/core/Utf8.php @@ -64,7 +64,6 @@ class CI_Utf8 { define('MB_ENABLED', FALSE); } - if ( @preg_match('/./u', 'é') === 1 // PCRE must support UTF-8 && function_exists('iconv') // iconv must be installed |