summaryrefslogtreecommitdiffstats
path: root/user_guide/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide/libraries')
-rw-r--r--user_guide/libraries/input.html12
-rw-r--r--user_guide/libraries/javascript.html2
-rw-r--r--user_guide/libraries/loader.html7
3 files changed, 16 insertions, 5 deletions
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html
index 479e71bf7..b34938b13 100644
--- a/user_guide/libraries/input.html
+++ b/user_guide/libraries/input.html
@@ -217,17 +217,17 @@ zero the cookie will only last as long as the browser is open.</p>
<code>$this->input->set_cookie($name, $value, $expire, $domain, $path, $prefix, $secure);</code>
-<h2>$this->input->get_cookie()</h2>
+<h2>$this->input->cookie()</h2>
<p>Lets you fetch a cookie. The first parameter will contain the name of the cookie you are looking for (including any prefixes):</p>
-<code>get_cookie('some_cookie');</code>
+<code>cookie('some_cookie');</code>
<p>The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.</p>
<p>The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;</p>
-<p><code>get_cookie('some_cookie', TRUE);</code></p>
+<p><code>cookie('some_cookie', TRUE);</code></p>
<h2>$this->input->ip_address()</h2>
@@ -269,7 +269,11 @@ else<br />
<h2>$this->input->is_ajax_request()</h2>
<p>Checks to see if the <var>HTTP_X_REQUESTED_WITH</var> server header has been set, and returns a boolean response.</p>
-<code>$this->input->is_ajax_request()</code>
+
+<h2>$this->input->is_cli_request()</h2>
+<p>Checks to see if the <var>STDIN</var> constant is set, which is a failsafe way to see if PHP is being run on the command line.</p>
+
+<code>$this->input->is_cli_request()</code>
</div>
diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html
index faa84174d..c1fd1fa56 100644
--- a/user_guide/libraries/javascript.html
+++ b/user_guide/libraries/javascript.html
@@ -147,7 +147,7 @@ $this->jquery->effect('bounce');
<p><code> $this-&gt;jquery-&gt;animate(target, parameters, optional speed, optional extra information);</code></p>
<ul>
<li>&quot;target&quot; will be any valid jQuery selector or selectors.</li>
- <li>&quot;paramters&quot; in jQuery would generally include a series of CSS properties that you wish to change.</li>
+ <li>&quot;parameters&quot; in jQuery would generally include a series of CSS properties that you wish to change.</li>
<li>&quot;speed&quot; is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.</li>
<li>&quot;extra information&quot; is optional, and could include a callback, or other additional information.</li>
</ul>
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index 7da087a43..62a250482 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -90,6 +90,10 @@ For example, if you have file located at:</p>
<p>You may nest the file in as many subdirectories as you want.</p>
+<p>Additionally, multiple libraries can be loaded at the same time by passing an array of libraries to the load function.</p>
+
+<code>$this->load->library(array('<var>email</var>', '<var>table</var>'));</code>
+
<h3>Setting options</h3>
<p>The second (optional) parameter allows you to optionally pass configuration setting. You will typically pass these as an array:</p>
@@ -105,6 +109,8 @@ $this->load->library('email', $config);</code>
<p>Config options can usually also be set via a config file. Each library is explained in detail in its own page, so please read the information regarding each one you would like to use.</p>
+<p>Please take note, when multiple libraries are supplied in an array for the first parameter, each will receive the same parameter information.</p>
+
<h3>Assigning a Library to a different object name</h3>
<p>If the third (optional) parameter is blank, the library will usually be assigned to an object with the same name as the library. For example, if the library is named <dfn>Session</dfn>, it
@@ -120,6 +126,7 @@ $this->my_session
</code>
+<p>Please take note, when multiple libraries are supplied in an array for the first parameter, this parameter is discarded.</p>
<h2>$this->load->view('<var>file_name</var>', <samp>$data</samp>, <kbd>true/false</kbd>)</h2>