diff options
| -rw-r--r-- | system/libraries/Ftp.php | 4 | ||||
| -rw-r--r-- | system/libraries/Model.php | 9 | ||||
| -rw-r--r-- | user_guide/general/multiple_apps.html | 139 | ||||
| -rw-r--r-- | user_guide/libraries/loader.html | 11 |
4 files changed, 4 insertions, 159 deletions
diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 3b2be23d5..1572a587c 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -178,7 +178,7 @@ class CI_FTP { if ($result === FALSE) { - if ($this->debug == TRUE AND $supress_debug != TRUE) + if ($this->debug == TRUE AND $supress_debug == FALSE) { $this->_error('ftp_unable_to_changedir'); } @@ -251,7 +251,7 @@ class CI_FTP { // Set the mode if not specified if ($mode == 'auto') { - // Get the file extension so we can se the upload type + // Get the file extension so we can set the upload type $ext = $this->_getext($locpath); $mode = $this->_settype($ext); } diff --git a/system/libraries/Model.php b/system/libraries/Model.php index 1c2b7afce..6f4f7e7ef 100644 --- a/system/libraries/Model.php +++ b/system/libraries/Model.php @@ -40,12 +40,7 @@ class Model { // We don't want to assign the model object to itself when using the // assign_libraries function below so we'll grab the name of the model parent - $methods = get_class_methods($this); - - if (isset($methods[0])) - { - $this->_parent_name = $methods[0]; - } + $this->_parent_name = ucfirst(get_class($this)); log_message('debug', "Model Class Initialized"); } @@ -65,7 +60,7 @@ class Model { foreach (array_keys(get_object_vars($CI)) as $key) { if ( ! isset($this->$key) AND $key != $this->_parent_name) - { + { // In some cases using references can cause // problems so we'll conditionally use them if ($use_reference == TRUE) diff --git a/user_guide/general/multiple_apps.html b/user_guide/general/multiple_apps.html deleted file mode 100644 index 387368b62..000000000 --- a/user_guide/general/multiple_apps.html +++ /dev/null @@ -1,139 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-
-<title>Code Igniter 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">
-window.onload = function() {
- myHeight = new fx.Height('nav', {duration: 400});
- myHeight.hide();
-}
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv='expires' content='-1' />
-<meta http-equiv= 'pragma' content='no-cache' />
-<meta name='robots' content='all' />
-<meta name='author' content='Rick Ellis' />
-<meta name='description' content='Code Igniter 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.jpg" width="153" height="44" 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>Code Igniter User Guide Version 1.5.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://www.codeigniter.com/">Code Igniter Home</a> ›
-<a href="../index.html">User Guide Home</a> ›
-Managing your Applications
-</td>
-<td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="www.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>Managing your Applications</h1>
-
-<p>By default it is assumed that you only intend to use Code Igniter to manage one application, which you will build in your
-<dfn>system/application/</dfn> directory. It is possible, however, to have multiple sets of applications that share a single
-Code Igniter installation, or even to rename or relocate your <dfn>application</dfn> folder.</p>
-
-<h2>Renaming the Application Folder</h2>
-
-<p>If you would like to rename your <dfn>applicaiton</dfn> folder you may do so as long as you open your main <kbd>index.php</kbd>
-file and set its name using the <samp>$application_folder</samp> variable:</p>
-
-<code>$application_folder = "application";</code>
-
-<h2>Relocating your Application Folder</h2>
-
-<p>It is possible to move your <dfn>application</dfn> folder to a different location on your server than your <kbd>system</kbd> folder.
-To do so open your main <kbd>index.php</kbd> and set a <em>full server path</em> in the <samp>$application_folder</samp> variable.</p>
-
-
-<code>$application_folder = "/Path/to/your/application";</code>
-
-
-<h2>Running Multiple Applications with one Code Igniter Installation</h2>
-
-<p>If you would like to share a common Code Igniter installation to manage several different applications simply
-put all of the directories located inside your <kbd>application</kbd> folder into their
-own sub-folder.</p>
-
-<p>For example, let's say you want to create two applications, "foo" and "bar". You will structure your
-application folder like this:
-
-<code>system/application/<var>foo</var>/<br />
-system/application/<var>foo</var>/config/<br />
-system/application/<var>foo</var>/controllers/<br />
-system/application/<var>foo</var>/errors/<br />
-system/application/<var>foo</var>/libraries/<br />
-system/application/<var>foo</var>/models/<br />
-system/application/<var>foo</var>/views/<br />
-system/application/<samp>bar</samp>/<br />
-system/application/<samp>bar</samp>/config/<br />
-system/application/<samp>bar</samp>/controllers/<br />
-system/application/<samp>bar</samp>/errors/<br />
-system/application/<samp>bar</samp>/libraries/<br />
-system/application/<samp>bar</samp>/models/<br />
-system/application/<samp>bar</samp>/views/</code>
-
-
-<p>To select a particular application for use requires that you open your main <kbd>index.php</kbd> file and set the <dfn>$application_folder</dfn>
-variable. For example, to select the "foo" application for use you would do this:</p>
-
-<code>$application_folder = "application/foo";</code>
-
-<p class="important"><strong>Note:</strong> Each of your applications will need its own <dfn>index.php</dfn> file which
-calls the desired application. The index.php file can be named anything you want.</p>
-
-
-
-
-
-</div>
-<!-- END CONTENT -->
-
-
-<div id="footer">
-<p>
-Previous Topic: <a href="caching.html">Web Page Caching</a>
- ·
-<a href="#top">Top of Page</a> ·
-<a href="../index.html">User Guide Home</a> ·
-Next Topic: <a href="alternative_php.html">Alternative PHP Syntax</a>
-<p>
-
-<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 61ed6bff8..c7cf82d40 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -88,17 +88,6 @@ Each library is described in detail in its own page, so please read the informat <p>Parameters can be passed to the library via an array in the second parameter.
-
-<p>If you would like your libraries assigned to a different variable name then the default you can specify the name in the second parameter:</p>
-
-<code>
-$this->load->library('email', 'E'); // Assigns the email object to "E"<br />
-<br />
-<kbd>$this->E-></kbd><samp><em>some_function</em>()</samp>
-</code>
-
-
-
<h2>$this->load->view('<var>file_name</var>', <samp>$data</samp>, <kbd>true/false</kbd>)</h2>
<p>This function is used to load your View files. If you haven't read the <a href="../general/views.html">Views</a> section of the
|