Skip to content

Commit 65b86dd

Browse files
Merge pull request chriskacerguis#528 from softwarespot/master
Updated files to match CI 3.0.1rc
2 parents 334be7b + 1a7adc2 commit 65b86dd

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

application/config/routes.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,43 @@
1111
| and its corresponding controller class/method. The segments in a
1212
| URL normally follow this pattern:
1313
|
14-
| example.com/class/method/id/
14+
| example.com/class/method/id/
1515
|
1616
| In some instances, however, you may want to remap this relationship
1717
| so that a different class/function is called than the one
1818
| corresponding to the URL.
1919
|
2020
| Please see the user guide for complete details:
2121
|
22-
| http://codeigniter.com/user_guide/general/routing.html
22+
| http://codeigniter.com/user_guide/general/routing.html
2323
|
2424
| -------------------------------------------------------------------------
2525
| RESERVED ROUTES
2626
| -------------------------------------------------------------------------
2727
|
2828
| There are three reserved routes:
2929
|
30-
| $route['default_controller'] = 'welcome';
30+
| $route['default_controller'] = 'welcome';
3131
|
3232
| This route indicates which controller class should be loaded if the
3333
| URI contains no data. In the above example, the "welcome" class
3434
| would be loaded.
3535
|
36-
| $route['404_override'] = 'errors/page_missing';
36+
| $route['404_override'] = 'errors/page_missing';
3737
|
3838
| This route will tell the Router which controller/method to use if those
3939
| provided in the URL cannot be matched to a valid route.
4040
|
41-
| $route['translate_uri_dashes'] = FALSE;
41+
| $route['translate_uri_dashes'] = FALSE;
4242
|
4343
| This is not exactly a route, but allows you to automatically route
4444
| controller and method names that contain dashes. '-' isn't a valid
4545
| class or method name character, so it requires translation.
4646
| When you set this option to TRUE, it will replace ALL dashes in the
4747
| controller and method URI segments.
4848
|
49-
| Examples: my-controller/index -> my_controller/index
50-
| my-controller/my-method -> my_controller/my_method
49+
| Examples: my-controller/index -> my_controller/index
50+
| my-controller/my-method -> my_controller/my_method
5151
*/
5252
$route['default_controller'] = 'welcome';
5353
$route['404_override'] = '';

application/controllers/Welcome.php

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33

44
class Welcome extends CI_Controller {
55

6-
/**
7-
* Index Page for this controller.
8-
*
9-
* Maps to the following URL
10-
* http://example.com/index.php/welcome
11-
* - or -
12-
* http://example.com/index.php/welcome/index
13-
* - or -
14-
* Since this controller is set as the default controller in
15-
* config/routes.php, it's displayed at http://example.com/
16-
*
17-
* So any other public methods not prefixed with an underscore will
18-
* map to /index.php/welcome/<method_name>
19-
* @see http://codeigniter.com/user_guide/general/urls.html
20-
*/
21-
public function index()
22-
{
23-
$this->load->helper('url');
6+
/**
7+
* Index Page for this controller.
8+
*
9+
* Maps to the following URL
10+
* http://example.com/index.php/welcome
11+
* - or -
12+
* http://example.com/index.php/welcome/index
13+
* - or -
14+
* Since this controller is set as the default controller in
15+
* config/routes.php, it's displayed at http://example.com/
16+
*
17+
* So any other public methods not prefixed with an underscore will
18+
* map to /index.php/welcome/<method_name>
19+
* @see http://codeigniter.com/user_guide/general/urls.html
20+
*/
21+
public function index()
22+
{
23+
$this->load->helper('url');
2424

25-
$this->load->view('welcome_message');
26-
}
25+
$this->load->view('welcome_message');
26+
}
2727
}

0 commit comments

Comments
 (0)