diff options
| author | Pascal Kriete <pascal.kriete@ellislab.com> | 2011-01-07 21:05:47 +0100 |
|---|---|---|
| committer | Pascal Kriete <pascal.kriete@ellislab.com> | 2011-01-07 21:05:47 +0100 |
| commit | 3ef0d283693178ceec9e9e4fb6b0d22538c3af34 (patch) | |
| tree | 9d9b78bed047f7cbfc4873d2dcba50173cd3be0b /application/config | |
| parent | 43ded2351b2703bf6fc6d9d0b2311cb08194d4bf (diff) | |
| parent | 0711dc87d98ce20d3a87f7ac43d78af8fba1dca7 (diff) | |
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'application/config')
| -rw-r--r-- | application/config/autoload.php | 25 | ||||
| -rw-r--r-- | application/config/mimes.php | 2 |
2 files changed, 20 insertions, 7 deletions
diff --git a/application/config/autoload.php b/application/config/autoload.php index 5e9740844..90b1a808f 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -18,16 +18,30 @@ | | These are the things you can load automatically: | -| 1. Libraries -| 2. Helper files -| 3. Custom config files -| 4. Language files -| 5. Models +| 1. Packages +| 2. Libraries +| 3. Helper files +| 4. Custom config files +| 5. Language files +| 6. Models | */ /* | ------------------------------------------------------------------- +| Auto-load Packges +| ------------------------------------------------------------------- +| Prototype: +| +| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared'); +| +*/ + +$autoload['packages'] = array(APPPATH.'third_party'); + + +/* +| ------------------------------------------------------------------- | Auto-load Libraries | ------------------------------------------------------------------- | These are the classes located in the system/libraries folder @@ -98,6 +112,5 @@ $autoload['language'] = array(); $autoload['model'] = array(); - /* End of file autoload.php */ /* Location: ./application/config/autoload.php */
\ No newline at end of file diff --git a/application/config/mimes.php b/application/config/mimes.php index f31fff2ec..146d3f9e0 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -56,7 +56,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'midi' => 'audio/midi', 'mpga' => 'audio/mpeg', 'mp2' => 'audio/mpeg', - 'mp3' => array('audio/mpeg', 'audio/mpg'), + 'mp3' => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3'), 'aif' => 'audio/x-aiff', 'aiff' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff', |