summaryrefslogtreecommitdiffstats
path: root/user_guide/libraries
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-06-11 15:16:35 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-06-11 15:16:35 +0200
commit686ff126762c0923556036a3cf73abb9390a7e67 (patch)
treec0aedf7f9ce68ed3e5880f9f1ba14ddf03eb7083 /user_guide/libraries
parent918eaef728eaf49387083b39add7106e029fcfb4 (diff)
parentcef5bda9765080b818898811023d9ab427b0faf2 (diff)
Fixed conflicts
Why were there conflicts merging into master?
Diffstat (limited to 'user_guide/libraries')
-rw-r--r--user_guide/libraries/form_validation.html2
-rw-r--r--user_guide/libraries/input.html2
-rw-r--r--user_guide/libraries/sessions.html2
-rw-r--r--user_guide/libraries/uri.html2
4 files changed, 4 insertions, 4 deletions
diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html
index 81f2b9582..8d6f3b6d2 100644
--- a/user_guide/libraries/form_validation.html
+++ b/user_guide/libraries/form_validation.html
@@ -1058,7 +1058,7 @@ POST array:</p>
<tr>
<td class="td"><strong>valid_ip</strong></td>
<td class="td">No</td>
- <td class="td">Returns FALSE if the supplied IP is not valid.</td>
+ <td class="td">Returns FALSE if the supplied IP is not valid. Accepts an optional parameter of "IPv4" or "IPv6" to specify an IP format.</td>
<td class="td">&nbsp;</td>
</tr>
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html
index 2f2d1830b..e199c58dd 100644
--- a/user_guide/libraries/input.html
+++ b/user_guide/libraries/input.html
@@ -248,7 +248,7 @@ else<br />
{<br />
&nbsp;&nbsp;&nbsp;&nbsp; echo 'Valid';<br />
}</code>
-
+<p>Accepts an optional second string parameter of "IPv4" or "IPv6" to specify an IP format. The default checks for both formats.</p>
<h2>$this->input->user_agent()</h2>
<p>Returns the user agent (web browser) being used by the current user. Returns FALSE if it's not available.</p>
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html
index ba9085f59..bfffa0b2f 100644
--- a/user_guide/libraries/sessions.html
+++ b/user_guide/libraries/sessions.html
@@ -221,7 +221,7 @@ prototype (for MySQL) required by the session class:</p>
<textarea class="textarea" style="width:100%" cols="50" rows="10">
CREATE TABLE IF NOT EXISTS `ci_sessions` (
session_id varchar(40) DEFAULT '0' NOT NULL,
- ip_address varchar(16) DEFAULT '0' NOT NULL,
+ ip_address varchar(45) DEFAULT '0' NOT NULL,
user_agent varchar(120) NOT NULL,
last_activity int(10) unsigned DEFAULT 0 NOT NULL,
user_data text NOT NULL,
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html
index 9b9b5d889..f333199ac 100644
--- a/user_guide/libraries/uri.html
+++ b/user_guide/libraries/uri.html
@@ -191,7 +191,7 @@ $str = $this->uri->assoc_to_uri($array);<br />
<p>The function would return this:</p>
-<code>/news/local/345</code>
+<code>news/local/345</code>
<h2>$this->uri->ruri_string()</h2>