summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-02-21 14:01:48 +0100
committerAndrey Andreev <narf@devilix.net>2014-02-21 14:01:48 +0100
commit2cf4c9bac558e978d376ef80c4f515d829706c4c (patch)
treede8c74fc3b7daeaee77a7edc89bb50d9a02dad7d /user_guide_src
parent344cf8061701aba9a2f43798fda11877053f7560 (diff)
CI_Upload changes
- Method chaining support. - A more abstract resetting of the default settings. - Added an option to initialize() to disable resetting to default settings. - Removed method mimes_types() and slightly optimized chunks of code where it was used. - Added the ability to pass allowed_types as an array.
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst13
-rw-r--r--user_guide_src/source/libraries/file_uploading.rst9
2 files changed, 16 insertions, 6 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 378494ec0..b654bc51f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -289,12 +289,15 @@ Release Date: Not Released
- :doc:`File Uploading Library <libraries/file_uploading>` changes include:
- - Added **max_filename_increment** config setting.
- - Added an **index** parameter to the ``data()`` method.
- - Added the **min_width** and **min_height** options for images.
+ - Added method chaining support.
+ - Added **max_filename_increment** and **file_ext_tolower** configuration settings.
+ - Added **min_width** and **min_height** configuration settings for images.
+ - Added **mod_mime_fix** configuration setting to disable suffixing multiple file extensions with an underscore.
+ - Added the possibility pass **allowed_types** as an array.
+ - Added an ``$index`` parameter to the method ``data()``.
+ - Added a ``$reset`` parameter to method ``initialize()``.
- Removed method ``clean_file_name()`` and its usage in favor of :doc:`Security Library <libraries/security>`'s ``sanitize_filename()``.
- - Added **file_ext_tolower** config setting.
- - Added **mod_mime_fix** option to disable suffixing multiple file extensions with an underscore.
+ - Removed method ``mimes_types()``.
- :doc:`Calendar Library <libraries/calendar>` changes include:
diff --git a/user_guide_src/source/libraries/file_uploading.rst b/user_guide_src/source/libraries/file_uploading.rst
index d7ba3a6c1..d93acb842 100644
--- a/user_guide_src/source/libraries/file_uploading.rst
+++ b/user_guide_src/source/libraries/file_uploading.rst
@@ -201,7 +201,7 @@ Preference Default Value Options Descripti
directory must be writable and the path can be absolute or relative.
**allowed_types** None None The mime types corresponding to the types of files you allow to be
uploaded. Usually the file extension can be used as the mime type.
- Separate multiple types with a pipe.
+ Can be either an array or a pipe-separated string.
**file_name** None Desired file name If set CodeIgniter will rename the uploaded file to this name. The
extension provided in the file name must also be an allowed file type.
If no extension is provided in the original file_name will be used.
@@ -254,6 +254,13 @@ Class Reference
.. class:: CI_Upload
+ .. method:: initialize([array $config = array()[, $reset = TRUE]])
+
+ :param array $config: Preferences
+ :param bool $reset: Whether to reset preferences (that are not provided in $config) to their defaults
+ :returns: CI_Upload instance (method chaining)
+ :rtype: CI_Upload
+
.. method:: do_upload([$field = 'userfile'])
:param string $field: Name of the form field