diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-11 15:16:35 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-11 15:16:35 +0200 |
| commit | 686ff126762c0923556036a3cf73abb9390a7e67 (patch) | |
| tree | c0aedf7f9ce68ed3e5880f9f1ba14ddf03eb7083 /user_guide | |
| parent | 918eaef728eaf49387083b39add7106e029fcfb4 (diff) | |
| parent | cef5bda9765080b818898811023d9ab427b0faf2 (diff) | |
Fixed conflicts
Why were there conflicts merging into master?
Diffstat (limited to 'user_guide')
| -rw-r--r-- | user_guide/changelog.html | 6 | ||||
| -rw-r--r-- | user_guide/installation/upgrade_211.html | 7 | ||||
| -rw-r--r-- | user_guide/libraries/form_validation.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/input.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/sessions.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/uri.html | 2 |
6 files changed, 16 insertions, 5 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d8fa374cb..e033864be 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,6 +69,8 @@ Change Log <li>Libraries <ul> <li>Further improved MIME type detection in the <a href="libraries/file_uploading.html">File Uploading Library</a>.</li> + <li>Added support for IPv6 to the <a href="libraries/input.html">Input Library</a>.</li> + <li>Added support for the IP format parameter to the <a href="libraries/form_validation.html">Form Validation Library</a>.</li> </ul> </li> <li>Helpers @@ -86,6 +88,10 @@ Change Log <li>Fixed a bug (#538) - Windows paths were ignored when using the <a href="libraries/image_lib.html">Image Manipulation Class</a> to create a new file.</li> <li>Fixed a bug - When database caching was enabled, $this->db->query() checked the cache before binding variables which resulted in cached queries never being found.</li> <li>Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.</li> + <li>Fixed a bug (#726) - PDO put a 'dbname' argument in it's connection string regardless of the database platform in use, which made it impossible to use SQLite.</li> + <li>Fixed a bug - CI_DB_pdo_result::num_rows() was not returning properly value with SELECT queries, cause it was relying on PDOStatement::rowCount().</li> + <li>Fixed a bug (#1059) - CI_Image_lib::clear() was not correctly clearing all necessary object properties, namely width and height.</li> + <li>Fixed a bug (#1387) - Active Record's <samp>from()</samp> method didn't escape table aliases.</li> </ul> diff --git a/user_guide/installation/upgrade_211.html b/user_guide/installation/upgrade_211.html index a2afdee2b..92b5faab1 100644 --- a/user_guide/installation/upgrade_211.html +++ b/user_guide/installation/upgrade_211.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>Upgrading from 2.0.3 to 2.1.0 : CodeIgniter User Guide</title> +<title>Upgrading from 2.1.0 to 2.1.1 : 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' /> @@ -69,6 +69,11 @@ Upgrading from 2.1.0 to 2.1.1 <p>This config file has been updated to contain more user mime-types, please copy it to <kbd>application/config/mimes.php</kbd>.</p> +<h2>Step 3: Update your IP address tables:</h2> + +<p>This upgrade adds support for IPv6 IP addresses. In order to store them, you need to enlarge your <var>ip_address</var> columns to 45 characters. For example, CodeIgniter's session table will need to change:</p> + +<code>ALTER TABLE ci_sessions CHANGE ip_address ip_address varchar(45) default '0' NOT NULL</code> </div> <!-- END CONTENT --> 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"> </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 /> 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> |