Merge pull request #5006 from tianhe1986/develop_common
Fix two bugs with Common Functions
diff --git a/system/core/Common.php b/system/core/Common.php
index 8437f79..8b74db0 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -319,17 +319,16 @@
if (empty($_mimes))
{
+ $_mimes = array();
+
+ if (file_exists(APPPATH.'config/mimes.php'))
+ {
+ $_mimes = array_merge($_mimes, include(APPPATH.'config/mimes.php'));
+ }
+
if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
{
- $_mimes = include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
- }
- elseif (file_exists(APPPATH.'config/mimes.php'))
- {
- $_mimes = include(APPPATH.'config/mimes.php');
- }
- else
- {
- $_mimes = array();
+ $_mimes = array_merge($_mimes, include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'));
}
}
@@ -719,6 +718,7 @@
{
$non_displayables[] = '/%0[0-8bcef]/i'; // url encoded 00-08, 11, 12, 14, 15
$non_displayables[] = '/%1[0-9a-f]/i'; // url encoded 16-31
+ $non_displayables[] = '/%7f/i'; // url encoded 127
}
$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127