diff options
| author | Greg Aker <greg@gregaker.net> | 2011-08-21 23:28:57 +0200 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-08-21 23:28:57 +0200 |
| commit | d3c9a4997f10891cf5cb5a1a0318f5c293b62d5e (patch) | |
| tree | d7ba7d0778a19eeffea082c068b40a26bcf67fe7 /user_guide | |
| parent | 2c4b36620828173f3caf83fc7f6146bccb3688f4 (diff) | |
| parent | 297eb2fa755d8d0202511d4181dc4dab115e842c (diff) | |
Merge branch 'develop' into feature/unit-tests
Diffstat (limited to 'user_guide')
| -rw-r--r-- | user_guide/changelog.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/file_uploading.html | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index bb05f99e1..301b264c4 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -89,6 +89,7 @@ Change Log <li class="reactor">Added support to set an optional parameter in your callback rules of validation using the <a href="libraries/form_validation.html">Form Validation Library</a>.</li> <li class="reactor">Added a <a href="libraries/migration.html">Migration Library</a> to assist with applying incremental updates to your database schema.</li> <li class="reactor">Driver children can be located in any package path.</li> + <li class="reactor">Added max_filename_increment config setting for Upload library.</li> </ul> </li> </ul> @@ -102,6 +103,7 @@ Change Log <li class="reactor">Fixed a bug (#200) where MySQL queries would be malformed after calling <samp>count_all()</samp> then <samp>db->get()</samp></li> <li>Fixed a bug (#181) where a mis-spelling was in the form validation language file.</li> <li>Fixed a bug (#160) - Removed unneeded array copy in the file cache driver.</li> + <li>Fixed a bug (#150) - <samp>field_data()</samp> now correctly returns column length.</li> </ul> <h2>Version 2.0.3</h2> diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index a88c67220..94b219355 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -305,6 +305,13 @@ $this->upload->initialize($config);</code> </tr> <tr> +<td class="td"><strong>max_filename_increment</strong></td> +<td class="td">100</td> +<td class="td">None</td> +<td class="td">When overwrite is set to FALSE, use this to set the maximum filename increment for CodeIgniter to append to the filename.</td> +</tr> + +<tr> <td class="td"><strong>encrypt_name</strong></td> <td class="td">FALSE</td> <td class="td">TRUE/FALSE (boolean)</td> |