summaryrefslogtreecommitdiff
path: root/includes/file.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-08-31 05:47:34 +0000
committerDries Buytaert <dries@buytaert.net>2009-08-31 05:47:34 +0000
commit41dca3c4e0ec3d355977735f74af2e49ea0eedd7 (patch)
treebd4ac8b82e19e018b3a0c8d12f11d2541fa8488f /includes/file.inc
parent26a5f0408b8db92f85af90695269cc69c67e41bf (diff)
downloadbrdo-41dca3c4e0ec3d355977735f74af2e49ea0eedd7.tar.gz
brdo-41dca3c4e0ec3d355977735f74af2e49ea0eedd7.tar.bz2
- Patch #331171 by pwolanin, mfb, drewish: allow modules to alter the MIME extension mapping rather than setting a huge variable.
Diffstat (limited to 'includes/file.inc')
-rw-r--r--includes/file.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/file.inc b/includes/file.inc
index 1ab7676a8..366bbc959 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -1684,12 +1684,12 @@ function file_upload_max_size() {
* An optional map of extensions to their mimetypes, in the form:
* - 'mimetypes': a list of mimetypes, keyed by an identifier,
* - 'extensions': the mapping itself, an associative array in which
- * the key is the extension (lowercase) and the value is the mimetype identifier.
- * If $mapping is omitted, the drupal variable mime_extension_mapping is checked
- * for a value and if that fails then file_default_mimetype_mapping() is called
+ * the key is the extension (lowercase) and the value is the mimetype
+ * identifier. If $mapping is NULL file_mimetype_mapping() is called.
*
* @return
- * The internet media type registered for the extension or application/octet-stream for unknown extensions.
+ * The internet media type registered for the extension or
+ * application/octet-stream for unknown extensions.
* @see
* file_default_mimetype_mapping()
*/