diff options
| author | Andrey Andreev <narf@devilix.net> | 2013-08-06 16:00:30 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2013-08-06 16:00:30 +0200 |
| commit | 5a215b6064c9ce7ee33db9a76bcb1a62bea16ec3 (patch) | |
| tree | f1ca126a98fddf103dec6d544536d6d240d32ffc /system/core | |
| parent | 5b55c15f24b518aa4775a0c15382c7b4bf72e1bc (diff) | |
| parent | 40d124924ea331c6a57ab1b3f743299a41eb3f0c (diff) | |
Merge pull request #2586 from vlakoff/develop
Various typos and tabs adjustments
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/Common.php | 6 | ||||
| -rw-r--r-- | system/core/Input.php | 4 | ||||
| -rw-r--r-- | system/core/Router.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index b95a05db9..28c60832c 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -538,7 +538,7 @@ if ( ! function_exists('set_status_header')) $server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : FALSE; - if (strpos(php_sapi_name(), 'cgi') === 0) + if (strpos(PHP_SAPI, 'cgi') === 0) { header('Status: '.$code.' '.$text, TRUE); } @@ -556,8 +556,8 @@ if ( ! function_exists('_exception_handler')) /** * Exception Handler * - * This is the custom exception handler that is declaired at the top - * of Codeigniter.php. The main reason we use this is to permit + * This is the custom exception handler that is declared at the top + * of CodeIgniter.php. The main reason we use this is to permit * PHP errors to be logged in our own log files since the user may * not have access to server logs. Since this function * effectively intercepts PHP errors, however, we also need diff --git a/system/core/Input.php b/system/core/Input.php index 0ef81128e..1e67ce183 100644 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -47,7 +47,7 @@ class CI_Input { public $ip_address = FALSE; /** - * User agent strin + * User agent string * * @var string */ @@ -872,7 +872,7 @@ class CI_Input { */ public function is_cli_request() { - return (php_sapi_name() === 'cli' OR defined('STDIN')); + return (PHP_SAPI === 'cli' OR defined('STDIN')); } // -------------------------------------------------------------------- diff --git a/system/core/Router.php b/system/core/Router.php index 989ae542e..0f7278ae6 100644 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -351,10 +351,10 @@ class CI_Router { return $this->_set_request(explode('/', $this->routes[$uri])); } - // Loop through the route array looking for wild-cards + // Loop through the route array looking for wildcards foreach ($this->routes as $key => $val) { - // Convert wild-cards to RegEx + // Convert wildcards to RegEx $key = str_replace(array(':any', ':num'), array('[^/]+', '[0-9]+'), $key); // Does the RegEx match? |