summaryrefslogtreecommitdiffstats
path: root/user_guide/general
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2010-11-10 21:58:58 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2010-11-10 21:58:58 +0100
commita88f04381a6c3953506d31a60a9909cb0d5243ee (patch)
tree7a548358c1de58e677b96b0c77e18d66b7491847 /user_guide/general
parent2893f00bf042057b73435d65814906e1f5d2380d (diff)
parent68e30fd718b98a4cc6a449dbfbad368670efc25d (diff)
Automated merge with http://hg.ellislab.com/CodeIgniterNoPhp4/
Diffstat (limited to 'user_guide/general')
-rw-r--r--user_guide/general/reserved_names.html27
1 files changed, 1 insertions, 26 deletions
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html
index 7ab518d20..3115d6a8a 100644
--- a/user_guide/general/reserved_names.html
+++ b/user_guide/general/reserved_names.html
@@ -67,34 +67,9 @@ is a list of reserved names. Do not name your controller any of these:</p>
<li>Controller</li>
<li>CI_Base</li>
<li>_ci_initialize</li>
- <li>Default (PHP 5)</li>
+ <li>Default</li>
<li>index</li>
</ul>
-<p><br /><!-- @PHP4 -->
- If you are running PHP 4 there are some additional reserved names. These ONLY apply if you are running PHP 4.</p>
-<ul>
- <li>CI_Loader</li>
- <li>config</li>
- <li>database</li>
- <li>dbutil</li>
- <li>dbforge</li>
- <li>file</li>
- <li>helper</li>
- <li>helpers</li>
- <li>language</li>
- <li>library</li>
- <li>model</li>
- <li>script</li>
- <li>view</li>
- <li>vars</li>
- <li>_ci_assign_to_models</li>
- <li>_ci_autoloader</li>
- <li>_ci_init_class</li>
- <li>_ci_is_instance</li>
- <li>_ci_load</li>
- <li>_ci_load_class</li>
- <li>_ci_object_to_array</li>
-</ul>
<h3>Functions</h3>
<ul>
<li>is_really_writable()</li>