diff options
-rw-r--r-- | system/libraries/Input.php | 6 | ||||
-rw-r--r-- | user_guide/database/active_record.html | 2 | ||||
-rw-r--r-- | user_guide/general/common_functions.html | 4 | ||||
-rw-r--r-- | user_guide/helpers/path_helper.html | 6 | ||||
-rw-r--r-- | user_guide/installation/upgrade_160.html | 4 | ||||
-rw-r--r-- | user_guide/libraries/xmlrpc.html | 32 |
6 files changed, 27 insertions, 27 deletions
diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 2682ce316..8d68f6998 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -489,14 +489,14 @@ class CI_Input { * XSS Clean
*
* Sanitizes data so that Cross Site Scripting Hacks can be
- * prevented. This function does a fair amount of work but
+ * prevented. This function does a fair amount of work but
* it is extremely thorough, designed to prevent even the
- * most obscure XSS attempts. Nothing is ever 100% foolproof,
+ * most obscure XSS attempts. Nothing is ever 100% foolproof,
* of course, but I haven't been able to get anything passed
* the filter.
*
* Note: This function should only be used to deal with data
- * upon submission. It's not something that should
+ * upon submission. It's not something that should
* be used for general runtime processing.
*
* This function was based in part on some code and ideas I
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 04e81d8cc..77a168fdb 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -699,7 +699,7 @@ $query = $this->db->get();</code> <h1><a name="caching"> </a>Active Record Caching</h1>
<p>While not "true" caching, Active Record enables you to save (or "cache") certain parts of your queries for reuse later. Normally, when an Active Record call is completed, all stored information is reset for the next call. With caching, you can prevent this reset, and reuse information easily.</p>
-<p>Cached calls are cumulative. If you make 2 cached select() calls, and then 2 uncached select() calls, this will result in 4 select() calls. There are three Caching functions available:</p>
+<p>Cached calls are cumulative. If you make 2 cached select() calls, and then 2 uncached select() calls, this will result in 4 select() calls. There are three Caching functions available:</p>
<h2>$this->db->start_cache()</h2>
<p>This function must be called to begin caching. All Active Record queries of the correct type (see below for supported queries) are stored for later use.</p>
<h2>$this->db->stop_cache()</h2>
diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index 65058b9e3..432ba02c3 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -62,11 +62,11 @@ Auto-loading Resources <p>is_writable() returns TRUE on Windows servers when you really can't write to the file as the OS reports to PHP as FALSE only if the read-only attribute is marked. This function determines if a file is actually writable by attempting to write to it first. Generally only recommended on platforms where this information may be unreliable.</p>
<code>if (is_really_writable('file.txt'))<br />
{<br />
- echo "I could write to this if I wanted to";<br />
+ echo "I could write to this if I wanted to";<br />
}<br />
else<br />
{<br />
- echo "File is not writable";<br />
+ echo "File is not writable";<br />
}</code>
<h2>config_item('<var>item_key</var>')</h2>
<p>The <a href="../libraries/config.html">Config library</a> is the preferred way of accessing configuration information, however config_item() can be used to retrieve single keys. See Config library documentation for more information.</p>
diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index 42f4713d6..78815a256 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -73,14 +73,14 @@ Path Helper <p>Checks to see if the path exists. This function will return a server path without symbolic links or relative directory structures. An optional second argument will cause an error to be triggered if the path cannot be resolved.</p>
<code>$directory = './../../etc/passwd';<br />
-echo set_realpath($directory);<br />
+echo set_realpath($directory);<br />
// returns "/etc/passwd"<br />
<br />
$non_existent_directory = './../../path/not/found';<br />
-echo set_realpath($non_existent_directory, TRUE);<br />
+echo set_realpath($non_existent_directory, TRUE);<br />
// returns "/path/not/found"<br />
<br />
-echo set_realpath($non_existent_directory, FALSE);<br />
+echo set_realpath($non_existent_directory, FALSE);<br />
// returns an <strong>error</strong>, as the path could not be resolved</code>
<h2> </h2>
</div>
diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index a62ae57a1..f9b4c3b94 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -84,11 +84,11 @@ Upgrading from 1.5.4 to 1.6.0 <p>Add the following to system/application/autoload.php</p>
<p><code> /*<br />
| -------------------------------------------------------------------<br />
- | Auto-load Model files<br />
+ | Auto-load Model files<br />
| -------------------------------------------------------------------<br />
| Prototype:<br />
|<br />
- | $autoload['model'] = array('my_model');<br />
+ | $autoload['model'] = array('my_model');<br />
|<br />
*/<br />
<br />
diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 7e57b5511..9c1b7145f 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -403,22 +403,22 @@ The Server receives the request and maps it to the "process" function, where a r <p>If you wish to use an associative array in your method parameters you will need to use a struct datatype:</p>
<code>$request = array(<br />
- array(<br />
- // Param 0<br />
- array(<br />
- 'name'=>'John'<br />
- ),<br />
- 'struct'<br />
- ),<br />
- array(<br />
- // Param 1<br />
- array(<br />
- 'size'=>'large',<br />
- 'shape'=>'round'<br />
- ),<br />
- 'struct'<br />
- )<br />
- );<br />
+ array(<br />
+ // Param 0<br />
+ array(<br />
+ 'name'=>'John'<br />
+ ),<br />
+ 'struct'<br />
+ ),<br />
+ array(<br />
+ // Param 1<br />
+ array(<br />
+ 'size'=>'large',<br />
+ 'shape'=>'round'<br />
+ ),<br />
+ 'struct'<br />
+ )<br />
+ );<br />
$this->xmlrpc->request($request);</code>
<p>You can retrieve the associative array when processing the request in the Server.</p>
|