summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-03-10 21:25:06 +0100
committerDerek Jones <derek.jones@ellislab.com>2010-03-10 21:25:06 +0100
commit0d69ee3cb63a1e91ff5a00d906115297f4b5a0ae (patch)
treeef66b916d67e5d08d9b56bdc6efe1214ae4232f1 /user_guide
parent7fa0f4aa89e570d01e53b02f3e0366e3313792f4 (diff)
updated Upload class docs to be accurate with the * filter for allowed_types
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/libraries/file_uploading.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html
index 151b95cb2..60290b185 100644
--- a/user_guide/libraries/file_uploading.html
+++ b/user_guide/libraries/file_uploading.html
@@ -255,7 +255,7 @@ $this->upload->initialize($config);</code>
<td class="td"><strong>allowed_types</strong></td>
<td class="td">None</td>
<td class="td">None</td>
-<td class="td">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.</td>
+<td class="td">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. If '*' is used, all file types will be allowed.</td>
</tr>