@@ -135,8 +135,7 @@ discard block |
||
135 | 135 | return $this->callControllerMethod( |
136 | 136 | $http_method, $argv, $params |
137 | 137 | ); |
138 | - } |
|
139 | - else |
|
138 | + } else |
|
140 | 139 | { |
141 | 140 | return $this->requestUri($http_method, $argv, $params); |
142 | 141 | } |
@@ -147,8 +146,7 @@ discard block |
||
147 | 146 | if ($e->getCode() === 0) |
148 | 147 | { |
149 | 148 | set_status_header(200); |
150 | - } |
|
151 | - else |
|
149 | + } else |
|
152 | 150 | { |
153 | 151 | set_status_header($e->getCode()); |
154 | 152 | } |
@@ -218,8 +216,7 @@ discard block |
||
218 | 216 | if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
219 | 217 | { |
220 | 218 | new CI_Controller(); |
221 | - } |
|
222 | - else |
|
219 | + } else |
|
223 | 220 | { |
224 | 221 | new CI(); |
225 | 222 | new MX_Controller(); |
@@ -29,16 +29,14 @@ discard block |
||
29 | 29 | if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php')) |
30 | 30 | { |
31 | 31 | $e404 = TRUE; |
32 | - } |
|
33 | - else |
|
32 | + } else |
|
34 | 33 | { |
35 | 34 | require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php'); |
36 | 35 | |
37 | 36 | if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method)) |
38 | 37 | { |
39 | 38 | $e404 = TRUE; |
40 | - } |
|
41 | - elseif (method_exists($class, '_remap')) |
|
39 | + } elseif (method_exists($class, '_remap')) |
|
42 | 40 | { |
43 | 41 | $params = array($method, array_slice($URI->rsegments, 2)); |
44 | 42 | $method = '_remap'; |
@@ -63,8 +61,7 @@ discard block |
||
63 | 61 | if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
64 | 62 | { |
65 | 63 | new CI_Controller(); |
66 | - } |
|
67 | - else |
|
64 | + } else |
|
68 | 65 | { |
69 | 66 | new CI(); |
70 | 67 | new MX_Controller(); |