diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-05-08 17:23:36 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-05-08 17:23:36 +0200 |
| commit | 0854d91fd2848266ec37a37c8a1ccfd13a8a4eda (patch) | |
| tree | 1433f1db86920fae6e6286c6cc517ba64cda2aba /user_guide/general/reserved_names.html | |
| parent | 0cb8c59f91567af9aa6530f8764abafe1ae935c0 (diff) | |
| parent | 3ef65bd7491f847fecdab1acc9687f0e90eee09b (diff) | |
Merged tip.
Diffstat (limited to 'user_guide/general/reserved_names.html')
| -rw-r--r-- | user_guide/general/reserved_names.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 2dbbb5bb6..48b6b2a5e 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -28,7 +28,7 @@ <div id="masthead"> <table cellpadding="0" cellspacing="0" border="0" style="width:100%"> <tr> -<td><h1>CodeIgniter User Guide Version 2.0.1</h1></td> +<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td> <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td> </tr> </table> @@ -61,8 +61,8 @@ Controllers <h3>Controller names</h3> <p>Since your controller classes will extend the main application controller you must be careful not to name your functions identically to the ones used by that class, otherwise your local functions -will override them. The following -is a list of reserved names. Do not name your controller any of these:</p> +will override them. The following +is a list of reserved names. Do not name your controller any of these:</p> <ul> <li>Controller</li> <li>CI_Base</li> @@ -90,6 +90,7 @@ is a list of reserved names. Do not name your controller any of these:</p> </ul> <h3>Constants</h3> <ul> + <li>ENVIRONMENT</li> <li>EXT</li> <li>FCPATH</li> <li>SELF</li> |