summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2012-01-03 15:19:22 +0100
committerEric Barnes <eric@ericlbarnes.com>2012-01-03 15:19:22 +0100
commit969785528e37c6b77eefc466a02669299141dce5 (patch)
tree7b009809fa0280d74b1506ef4f830e1345045c70 /application
parent29e1122c19c532b7299598fb7ddfb7f15264ad78 (diff)
parent7c9766a67948613b7fcb141728fb41fcd3ea1844 (diff)
Merge pull request #859 from narfbg/develop-701
Add KMZ and KML (Google Earth) file types to mimes.php
Diffstat (limited to 'application')
-rw-r--r--application/config/mimes.php13
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 */