diff options
author | Pascal Kriete <pascal.kriete@ellislab.com> | 2010-11-10 21:58:58 +0100 |
---|---|---|
committer | Pascal Kriete <pascal.kriete@ellislab.com> | 2010-11-10 21:58:58 +0100 |
commit | a88f04381a6c3953506d31a60a9909cb0d5243ee (patch) | |
tree | 7a548358c1de58e677b96b0c77e18d66b7491847 /user_guide | |
parent | 2893f00bf042057b73435d65814906e1f5d2380d (diff) | |
parent | 68e30fd718b98a4cc6a449dbfbad368670efc25d (diff) |
Automated merge with http://hg.ellislab.com/CodeIgniterNoPhp4/
Diffstat (limited to 'user_guide')
-rw-r--r-- | user_guide/general/reserved_names.html | 27 | ||||
-rw-r--r-- | user_guide/helpers/compatibility_helper.html | 118 |
2 files changed, 1 insertions, 144 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> diff --git a/user_guide/helpers/compatibility_helper.html b/user_guide/helpers/compatibility_helper.html deleted file mode 100644 index 9afec6541..000000000 --- a/user_guide/helpers/compatibility_helper.html +++ /dev/null @@ -1,118 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>Compatibility Helper : CodeIgniter User Guide</title> - -<style type='text/css' media='all'>@import url('../userguide.css');</style> -<link rel='stylesheet' type='text/css' media='all' href='../userguide.css' /> - -<script type="text/javascript" src="../nav/nav.js"></script> -<script type="text/javascript" src="../nav/prototype.lite.js"></script> -<script type="text/javascript" src="../nav/moo.fx.js"></script> -<script type="text/javascript" src="../nav/user_guide_menu.js"></script> - -<meta http-equiv='expires' content='-1' /> -<meta http-equiv= 'pragma' content='no-cache' /> -<meta name='robots' content='all' /> -<meta name='author' content='ExpressionEngine Dev Team' /> -<meta name='description' content='CodeIgniter User Guide' /> - -</head> -<body> - -<!-- START NAVIGATION --> -<div id="nav"><div id="nav_inner"><script type="text/javascript">create_menu('../');</script></div></div> -<div id="nav2"><a name="top"></a><a href="javascript:void(0);" onclick="myHeight.toggle();"><img src="../images/nav_toggle_darker.jpg" width="154" height="43" border="0" title="Toggle Table of Contents" alt="Toggle Table of Contents" /></a></div> -<div id="masthead"> -<table cellpadding="0" cellspacing="0" border="0" style="width:100%"> -<tr> -<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td> -<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td> -</tr> -</table> -</div> -<!-- END NAVIGATION --> - - -<!-- START BREADCRUMB --> - -<table cellpadding="0" cellspacing="0" border="0" style="width:100%"> -<tr> -<td id="breadcrumb"> -<a href="http://codeigniter.com/">CodeIgniter Home</a> › -<a href="../index.html">User Guide Home</a> › -Compatibility Helper -</td> -<td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="codeigniter.com/user_guide/" />Search User Guide <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" /> <input type="submit" class="submit" name="sa" value="Go" /></form></td> -</tr> -</table> -<!-- END BREADCRUMB --> - -<br clear="all" /> - - -<!-- START CONTENT --> -<div id="content"> - - -<h1>Compatibility Helper</h1> - -<p>The Compatibility Helper file contains PHP 4 implementations of some PHP 5 only native PHP functions and constants. This can be useful - if you'd like to take advantage of some of these native function but your application may end up running on a PHP 4 server. - In these cases, it may be advantageous to <a href="../general/autoloader.html">Auto-load</a> the Compatibility Helper so you - do not have to load it in each controller.</p> - -<p class="important"><strong>Note:</strong> There are a few compatibility functions that are in CodeIgniter's native Compat.php file. - You may use those functions without loading this helper. The functions are split between that file and this Helper so that only - functions required by the framework are included by default. This way, whether or not you load the additional functions in this Helper - remains your choice.</p> - -<h2>Loading this Helper</h2> - -<p>This helper is loaded using the following code:</p> -<code>$this->load->helper('compatibility');</code> - -<h2>Available Constants</h2> -<p>The following constants are available:</p> - -<h3>PHP_EOL</h3> -<p>The newline character for the server's current OS, e.g. on Windows systems "\r\n", on *nix "\n". - -<h2>Available Functions</h2> -<p>The following functions are available (see linked PHP documentation for documentation):</p> - -<h3><a href="http://us.php.net/manual/en/function.file-put-contents.php">file_put_contents()</a> - The fourth parameter, <var>$context</var>, is not supported.</h3> - -<h3><a href="http://us.php.net/manual/en/function.fputcsv.php">fputcsv()</a></h3> - -<h3><a href="http://us.php.net/manual/en/function.http-build-query.php">http_build_query()</a></h3> - -<h3><a href="http://us.php.net/manual/en/function.str-ireplace.php">str_ireplace()</a> - The fourth parameter, <var>$count</var>, is not supported, as PHP 4 would make it become required.</h3> - -<h3><a href="http://us.php.net/manual/en/function.stripos.php">stripos()</a></h3> - - - - - - - -</div> -<!-- END CONTENT --> - - -<div id="footer"> -<p> -Previous Topic: <a href="array_helper.html">Array Helper</a> - · -<a href="#top">Top of Page</a> · -<a href="../index.html">User Guide Home</a> · -Next Topic: <a href="cookie_helper.html">Cookie Helper</a> -</p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006-2010 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> -</div> - -</body> -</html>
\ No newline at end of file |