summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2019-09-27 22:38:06 +0200
committerFlorian Pritz <bluewind@xinu.at>2019-09-27 22:38:06 +0200
commit9067e097cc335b4ec207d7c8c6a819741446a163 (patch)
tree3770e3d890ae5d968a1873ff55c40cedcc5a88af /application
parent3db68e2e947b6299a15ed5277b65b49ad1768415 (diff)
parentb73eb19aed66190c10c9cad476da7c36c271d6dc (diff)
Merge tag '3.1.11' of git://github.com/bcit-ci/CodeIgniter into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application')
-rw-r--r--application/config/foreign_chars.php23
-rw-r--r--application/config/mimes.php2
-rw-r--r--application/config/user_agents.php1
3 files changed, 19 insertions, 7 deletions
diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php
index 995f48304..0231f3592 100644
--- a/application/config/foreign_chars.php
+++ b/application/config/foreign_chars.php
@@ -22,10 +22,10 @@ $foreign_characters = array(
'/б/' => 'b',
'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
'/ç|ć|ĉ|ċ|č/' => 'c',
- '/Д/' => 'D',
- '/д/' => 'd',
- '/Ð|Ď|Đ|Δ/' => 'Dj',
- '/ð|ď|đ|δ/' => 'dj',
+ '/Д|Δ/' => 'D',
+ '/д|δ/' => 'd',
+ '/Ð|Ď|Đ/' => 'Dj',
+ '/ð|ď|đ/' => 'dj',
'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ|Е|Э/' => 'E',
'/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ|е|э/' => 'e',
'/Ф/' => 'F',
@@ -38,6 +38,8 @@ $foreign_characters = array(
'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ|ỉ|ị|и|ы|ї/' => 'i',
'/Ĵ/' => 'J',
'/ĵ/' => 'j',
+ '/Θ/' => 'TH',
+ '/θ/' => 'th',
'/Ķ|Κ|К/' => 'K',
'/ķ|κ|к/' => 'k',
'/Ĺ|Ļ|Ľ|Ŀ|Ł|Λ|Л/' => 'L',
@@ -54,8 +56,8 @@ $foreign_characters = array(
'/ŕ|ŗ|ř|ρ|р/' => 'r',
'/Ś|Ŝ|Ş|Ș|Š|Σ|С/' => 'S',
'/ś|ŝ|ş|ș|š|ſ|σ|ς|с/' => 's',
- '/Ț|Ţ|Ť|Ŧ|τ|Т/' => 'T',
- '/ț|ţ|ť|ŧ|т/' => 't',
+ '/Ț|Ţ|Ť|Ŧ|Τ|Т/' => 'T',
+ '/ț|ţ|ť|ŧ|τ|т/' => 't',
'/Þ|þ/' => 'th',
'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/' => 'U',
'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/' => 'u',
@@ -65,6 +67,10 @@ $foreign_characters = array(
'/в/' => 'v',
'/Ŵ/' => 'W',
'/ŵ/' => 'w',
+ '/Φ/' => 'F',
+ '/φ/' => 'f',
+ '/Χ/' => 'CH',
+ '/χ/' => 'ch',
'/Ź|Ż|Ž|Ζ|З/' => 'Z',
'/ź|ż|ž|ζ|з/' => 'z',
'/Æ|Ǽ/' => 'AE',
@@ -73,10 +79,15 @@ $foreign_characters = array(
'/ij/' => 'ij',
'/Œ/' => 'OE',
'/ƒ/' => 'f',
+ '/Ξ/' => 'KS',
'/ξ/' => 'ks',
+ '/Π/' => 'P',
'/π/' => 'p',
+ '/Β/' => 'V',
'/β/' => 'v',
+ '/Μ/' => 'M',
'/μ/' => 'm',
+ '/Ψ/' => 'PS',
'/ψ/' => 'ps',
'/Ё/' => 'Yo',
'/ё/' => 'yo',
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 0ec9db0a0..7aa5c9e4e 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -140,7 +140,7 @@ return array(
'f4v' => array('video/mp4', 'video/x-f4v'),
'flv' => 'video/x-flv',
'webm' => 'video/webm',
- 'aac' => 'audio/x-acc',
+ 'aac' => array('audio/x-aac', 'audio/aac'),
'm4u' => 'application/vnd.mpegurl',
'm3u' => 'text/plain',
'xspf' => 'application/xspf+xml',
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index ad0b0fd20..c1581e5cd 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -151,6 +151,7 @@ $mobiles = array(
'wii' => 'Nintendo Wii',
'open web' => 'Open Web',
'openweb' => 'OpenWeb',
+ 'meizu' => 'Meizu',
// Operating Systems
'android' => 'Android',