diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-01-03 15:26:18 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-01-03 15:26:18 +0100 |
| commit | 69b3b9fcf63d2bcee7cb2f4097e1770bd159d499 (patch) | |
| tree | 5c26b21d80a90b5fd14f807f3060841296b1e7fe /application | |
| parent | d81150feddf5605d6afe70d4f641f013e42df586 (diff) | |
| parent | 969785528e37c6b77eefc466a02669299141dce5 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop-xmlrpc
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/mimes.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index f64db155e..8c34fd298 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -1,13 +1,13 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * * An open source application development framework for PHP 5.1.6 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Academic Free License version 3.0 - * + * * This source file is subject to the Academic Free License (AFL 3.0) that is * bundled with this package in the files license_afl.txt / license_afl.rst. * It is also available through the world wide web at this URL: @@ -111,8 +111,8 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe 'log' => array('text/plain', 'text/x-log'), 'rtx' => 'text/richtext', 'rtf' => 'text/rtf', - 'xml' => 'text/xml', - 'xsl' => 'text/xml', + 'xml' => array('application/xml', 'text/xml'), + 'xsl' => array('application/xml', 'text/xsl', 'text/xml'), 'mpeg' => 'video/mpeg', 'mpg' => 'video/mpeg', 'mpe' => 'video/mpeg', @@ -160,8 +160,9 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe 'ac3' => 'audio/ac3', 'flac' => 'audio/x-flac', 'ogg' => 'audio/ogg', + 'kmz' => array('application/vnd.google-earth.kmz', 'application/zip', 'application/x-zip'), + 'kml' => array('application/vnd.google-earth.kml+xml', 'application/xml', 'text/xml') ); - /* End of file mimes.php */ /* Location: ./application/config/mimes.php */ |