diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2009-02-10 22:01:47 +0100 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2009-02-10 22:01:47 +0100 |
| commit | 7b3b96cff8d0b1b36caaaef5cd58fcfea5e3537e (patch) | |
| tree | 205c274d8af1725bdab5a146b9b5f83841155bf8 | |
| parent | 1d89088e2bbab32e80bd9fe0d74d5df32ab1e3ac (diff) | |
fixed a bug in the regex pattern to converts tabs and spaces into a single space
http://codeigniter.com/bug_tracker/bug/6662/
| -rw-r--r-- | system/database/DB_driver.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index dac4c8bdf..42b6a7577 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1213,7 +1213,7 @@ class CI_DB_driver { } // Convert tabs or multiple spaces into single spaces - $item = preg_replace('/[\t| ]+/', ' ', $item); + $item = preg_replace('/[\t ]+/', ' ', $item); // If the item has an alias declaration we remove it and set it aside. // Basically we remove everything to the right of the first space diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d9017d904..a0a54a33a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -110,6 +110,7 @@ SVN Revision: </p> <li>Fixed a bug when using DB cache on multiple databases (#5737).</li> <li>Fixed a bug where TRUNCATE was not considered a "write" query (#6619).</li> <li>Fixed a bug where csv_from_result() was checking for a nonexistent method.</li> + <li>Fixed a bug _protect_identifiers() where it was improperly removing all pipe symbols from items</li> </ul> </li> <li>Fixed assorted user guide typos or examples (#5998, #6093, #6259, #6339, #6432, #6521).</li> |