@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | |
| 264 | 264 | // Save status code in Output object |
| 265 | 265 | // added by ci-phpunit-test |
| 266 | - $CI =& get_instance(); |
|
| 266 | + $CI = & get_instance(); |
|
| 267 | 267 | $output = $CI->output; |
| 268 | 268 | $output->_status = [ |
| 269 | 269 | 'code' => $code, |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | if (empty($_config)) |
| 377 | 377 | { |
| 378 | 378 | // references cannot be directly assigned to static variables, so we use an array |
| 379 | - $_config[0] =& get_config(); |
|
| 379 | + $_config[0] = & get_config(); |
|
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | return isset($_config[0][$item]) ? $_config[0][$item] : NULL; |
@@ -158,14 +158,16 @@ discard block |
||
| 158 | 158 | if ($status_code < 100) |
| 159 | 159 | { |
| 160 | 160 | $exit_status = $status_code + 9; // 9 is EXIT__AUTO_MIN |
| 161 | - if ($exit_status > 125) // 125 is EXIT__AUTO_MAX |
|
| 161 | + if ($exit_status > 125) { |
|
| 162 | + // 125 is EXIT__AUTO_MAX |
|
| 162 | 163 | { |
| 163 | - $exit_status = 1; // EXIT_ERROR |
|
| 164 | + $exit_status = 1; |
|
| 165 | + } |
|
| 166 | + // EXIT_ERROR |
|
| 164 | 167 | } |
| 165 | 168 | |
| 166 | 169 | $status_code = 500; |
| 167 | - } |
|
| 168 | - else |
|
| 170 | + } else |
|
| 169 | 171 | { |
| 170 | 172 | $exit_status = 1; // EXIT_ERROR |
| 171 | 173 | } |
@@ -254,8 +256,7 @@ discard block |
||
| 254 | 256 | if (isset($stati[$code])) |
| 255 | 257 | { |
| 256 | 258 | $text = $stati[$code]; |
| 257 | - } |
|
| 258 | - else |
|
| 259 | + } else |
|
| 259 | 260 | { |
| 260 | 261 | show_error('No status text available. Please check your status code number or supply your own message text.', 500); |
| 261 | 262 | } |
@@ -281,8 +282,7 @@ discard block |
||
| 281 | 282 | if (strpos(PHP_SAPI, 'cgi') === 0) |
| 282 | 283 | { |
| 283 | 284 | header('Status: '.$code.' '.$text, TRUE); |
| 284 | - } |
|
| 285 | - else |
|
| 285 | + } else |
|
| 286 | 286 | { |
| 287 | 287 | $server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1'; |
| 288 | 288 | header($server_protocol.' '.$code.' '.$text, TRUE, $code); |
@@ -325,8 +325,7 @@ discard block |
||
| 325 | 325 | if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php')) |
| 326 | 326 | { |
| 327 | 327 | require($file_path); |
| 328 | - } |
|
| 329 | - elseif ( ! $found) |
|
| 328 | + } elseif ( ! $found) |
|
| 330 | 329 | { |
| 331 | 330 | set_status_header(503); |
| 332 | 331 | echo 'The configuration file does not exist.'; |