diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:56:50 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:56:50 +0200 |
| commit | 37f4b9caa02783e06dd7c5318200113409a0deb1 (patch) | |
| tree | 314bd87831a09913cbbfd1ffe1447b3c38b394c5 /application/config/mimes.php | |
| parent | 114ab0988e20ac6be39ad363ff897a1a3b85e565 (diff) | |
backed out 648b42a75739, which was a NON-trivial whitespace commit. It broke the Typography class's string replacements, for instance
Diffstat (limited to 'application/config/mimes.php')
| -rw-r--r-- | application/config/mimes.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index e573ed061..8065794ff 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -1,9 +1,9 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /* | ------------------------------------------------------------------- | MIME TYPES | ------------------------------------------------------------------- -| This file contains an array of mime types. It is used by the +| This file contains an array of mime types. It is used by the | Upload class to help identify allowed file types. | */ @@ -51,7 +51,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'tgz' => array('application/x-tar', 'application/x-gzip-compressed'), 'xhtml' => 'application/xhtml+xml', 'xht' => 'application/xhtml+xml', - 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'), + 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'), 'mid' => 'audio/midi', 'midi' => 'audio/midi', 'mpga' => 'audio/mpeg', @@ -71,7 +71,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'jpeg' => array('image/jpeg', 'image/pjpeg'), 'jpg' => array('image/jpeg', 'image/pjpeg'), 'jpe' => array('image/jpeg', 'image/pjpeg'), - 'png' => array('image/png', 'image/x-png'), + 'png' => array('image/png', 'image/x-png'), 'tiff' => 'image/tiff', 'tif' => 'image/tiff', 'css' => 'text/css', |