diff options
| author | John de Kroon <johndekroon@gmail.com> | 2018-09-03 11:21:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 11:21:33 +0200 |
| commit | 8abd21b17e9da1f3808f537643bfeaba0a790837 (patch) | |
| tree | 26119f00ab2a4931a54d2b55874cdc8d5217d4d1 /application | |
| parent | 9bf6753a1bcd54d6ca69fc194efc9f982661aa66 (diff) | |
| parent | 8537680955fbc045bf8011a2915e18583a91d52f (diff) | |
Merge pull request #1 from bcit-ci/develop
Update from source
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/config.php | 4 | ||||
| -rw-r--r-- | application/config/constants.php | 4 | ||||
| -rw-r--r-- | application/config/mimes.php | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/application/config/config.php b/application/config/config.php index 72e79bee9..782b19c74 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -88,7 +88,7 @@ $config['language'] = 'english'; | This determines which character set is used by default in various methods | that require a character set to be provided. | -| See http://php.net/htmlspecialchars for a list of supported charsets. +| See https://secure.php.net/htmlspecialchars for a list of supported charsets. | */ $config['charset'] = 'UTF-8'; @@ -133,7 +133,7 @@ $config['subclass_prefix'] = 'MY_'; | | $config['composer_autoload'] = '/path/to/vendor/autoload.php'; | -| For more information about Composer, please visit http://getcomposer.org/ +| For more information about Composer, please visit https://getcomposer.org/ | | Note: This will NOT disable or override the CodeIgniter-specific | autoloading (application/config/autoload.php) diff --git a/application/config/constants.php b/application/config/constants.php index 18d3b4b76..fb5878447 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -65,10 +65,10 @@ defined('FOPEN_READ_WRITE_CREATE_STRICT') OR define('FOPEN_READ_WRITE_CREA | are as follows: | | Standard C/C++ Library (stdlibc): -| http://www.gnu.org/software/libc/manual/html_node/Exit-Status.html +| https://www.gnu.org/software/libc/manual/html_node/Exit-Status.html | (This link also contains other GNU-specific conventions) | BSD sysexits.h: -| http://www.gsp.com/cgi-bin/man.cgi?section=3&topic=sysexits +| https://www.gsp.com/cgi-bin/man.cgi?section=3&topic=sysexits | Bash scripting: | http://tldp.org/LDP/abs/html/exitcodes.html | diff --git a/application/config/mimes.php b/application/config/mimes.php index 017653335..0ec9db0a0 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -155,7 +155,8 @@ return array( 'ics' => 'text/calendar', 'ical' => 'text/calendar', 'zsh' => 'text/x-scriptzsh', - '7zip' => array('application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'), + '7z' => array('application/x-7z-compressed', 'application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'), + '7zip' => array('application/x-7z-compressed', 'application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'), 'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'), 'wma' => array('audio/x-ms-wma', 'video/x-ms-asf'), 'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'), |