From 7efad20597ef7e06f8cf837a9f40918d2d3f2727 Mon Sep 17 00:00:00 2001
From: Jamie Rumbelow
Date: Sun, 19 Feb 2012 12:37:00 +0000
Subject: Renaming Active Record to Query Builder across the system
---
application/config/database.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'application')
diff --git a/application/config/database.php b/application/config/database.php
index bd68db1d8..b1cad9025 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -45,7 +45,7 @@
| ['dbdriver'] The database type. e.g.: mysql. Currently supported:
mysql, mysqli, pdo, postgre, odbc, mssql, sqlite, oci8
| ['dbprefix'] You can add an optional prefix, which will be added
-| to the table name when using the Active Record class
+| to the table name when using the Query Builder class
| ['pconnect'] TRUE/FALSE - Whether to use a persistent connection
| ['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
| ['cache_on'] TRUE/FALSE - Enables/disables query caching
@@ -68,12 +68,12 @@
| The $active_group variable lets you choose which connection group to
| make active. By default there is only one group (the 'default' group).
|
-| The $active_record variables lets you determine whether or not to load
-| the active record class
+| The $query_builder variables lets you determine whether or not to load
+| the query builder class
*/
$active_group = 'default';
-$active_record = TRUE;
+$query_builder = TRUE;
$db['default']['dsn'] = '';
$db['default']['hostname'] = 'localhost';
--
cgit v1.2.3-24-g4f1b
From d294a58e1090819e7ce8701f54b80bca43bac6a6 Mon Sep 17 00:00:00 2001
From: Timothy Warren
Date: Wed, 4 Apr 2012 13:28:39 -0400
Subject: Make database config easier to work with
---
application/config/database.php | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
(limited to 'application')
diff --git a/application/config/database.php b/application/config/database.php
index 744de0392..8c06dd2e6 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -75,23 +75,25 @@
$active_group = 'default';
$active_record = TRUE;
-$db['default']['dsn'] = '';
-$db['default']['hostname'] = 'localhost';
-$db['default']['username'] = '';
-$db['default']['password'] = '';
-$db['default']['database'] = '';
-$db['default']['dbdriver'] = 'mysql';
-$db['default']['dbprefix'] = '';
-$db['default']['pconnect'] = FALSE;
-$db['default']['db_debug'] = TRUE;
-$db['default']['cache_on'] = FALSE;
-$db['default']['cachedir'] = '';
-$db['default']['char_set'] = 'utf8';
-$db['default']['dbcollat'] = 'utf8_general_ci';
-$db['default']['swap_pre'] = '';
-$db['default']['autoinit'] = TRUE;
-$db['default']['stricton'] = FALSE;
-$db['default']['failover'] = array();
+$db['default'] = array(
+ 'dsn' => '',
+ 'hostname' => 'localhost',
+ 'username' => '',
+ 'password' => '',
+ 'database' => '',
+ 'dbdriver' => 'mysqli',
+ 'dbprefix' => '',
+ 'pconnect' => FALSE,
+ 'db_debug' => TRUE,
+ 'cache_on' => FALSE,
+ 'cachedir' => '',
+ 'char_set' => 'utf8',
+ 'dbcollat' => 'utf8_general_ci',
+ 'swap_pre' => '',
+ 'autoinit' => TRUE,
+ 'stricton' => FALSE,
+ 'failover' => array()
+);
/* End of file database.php */
/* Location: ./application/config/database.php */
\ No newline at end of file
--
cgit v1.2.3-24-g4f1b
From eafad45b9fbd37f42058366ca7bd17d6bb848ed8 Mon Sep 17 00:00:00 2001
From: Timothy Warren
Date: Tue, 17 Apr 2012 09:15:05 -0400
Subject: Updated supported database driver list
---
application/config/database.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'application')
diff --git a/application/config/database.php b/application/config/database.php
index 8c06dd2e6..59b223896 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -43,7 +43,8 @@
| ['password'] The password used to connect to the database
| ['database'] The name of the database you want to connect to
| ['dbdriver'] The database type. e.g.: mysql. Currently supported:
- mysql, mysqli, pdo, postgre, odbc, mssql, sqlite, oci8
+ cubrid, interbase, mssql, mysql, mysqli, oci8, odbc,
+ pdo, postgre, sqlite, sqlite3, sqlsrv
| ['dbprefix'] You can add an optional prefix, which will be added
| to the table name when using the Active Record class
| ['pconnect'] TRUE/FALSE - Whether to use a persistent connection
--
cgit v1.2.3-24-g4f1b
From 43481d0be0f508feadd6ef51403236606fb23cc6 Mon Sep 17 00:00:00 2001
From: Timothy Warren
Date: Tue, 17 Apr 2012 09:17:40 -0400
Subject: minor style fix
---
application/config/database.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'application')
diff --git a/application/config/database.php b/application/config/database.php
index 59b223896..f08d88761 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -43,8 +43,8 @@
| ['password'] The password used to connect to the database
| ['database'] The name of the database you want to connect to
| ['dbdriver'] The database type. e.g.: mysql. Currently supported:
- cubrid, interbase, mssql, mysql, mysqli, oci8, odbc,
- pdo, postgre, sqlite, sqlite3, sqlsrv
+| cubrid, interbase, mssql, mysql, mysqli, oci8,
+| odbc, pdo, postgre, sqlite, sqlite3, sqlsrv
| ['dbprefix'] You can add an optional prefix, which will be added
| to the table name when using the Active Record class
| ['pconnect'] TRUE/FALSE - Whether to use a persistent connection
--
cgit v1.2.3-24-g4f1b
From 25ead353e8e7cf17d627eda1fe10ef218418c1ff Mon Sep 17 00:00:00 2001
From: George Petsagourakis
Date: Tue, 24 Apr 2012 20:07:58 +0300
Subject: Added Greek characters to the foreign_chars.php
---
application/config/foreign_chars.php | 61 +++++++++++++++++++-----------------
1 file changed, 33 insertions(+), 28 deletions(-)
(limited to 'application')
diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php
index e2d3f236e..be97b6310 100644
--- a/application/config/foreign_chars.php
+++ b/application/config/foreign_chars.php
@@ -40,50 +40,55 @@ $foreign_characters = array(
'/Ä/' => 'Ae',
'/Ü/' => 'Ue',
'/Ö/' => 'Oe',
- '/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ/' => 'A',
- '/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª/' => 'a',
+ '/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ|Α|Ά/' => 'A',
+ '/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª|α|ά/' => 'a',
'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
'/ç|ć|ĉ|ċ|č/' => 'c',
- '/Ð|Ď|Đ/' => 'Dj',
- '/ð|ď|đ/' => 'dj',
- '/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě/' => 'E',
- '/è|é|ê|ë|ē|ĕ|ė|ę|ě/' => 'e',
- '/Ĝ|Ğ|Ġ|Ģ/' => 'G',
- '/ĝ|ğ|ġ|ģ/' => 'g',
+ '/Ð|Ď|Đ|Δ/' => 'Dj',
+ '/ð|ď|đ|δ/' => 'dj',
+ '/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ/' => 'E',
+ '/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε/' => 'e',
+ '/Ĝ|Ğ|Ġ|Ģ|Γ/' => 'G',
+ '/ĝ|ğ|ġ|ģ|γ/' => 'g',
'/Ĥ|Ħ/' => 'H',
'/ĥ|ħ/' => 'h',
- '/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ/' => 'I',
- '/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı/' => 'i',
+ '/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ|Η|Ή|Ί|Ι|Ϊ/' => 'I',
+ '/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ/' => 'i',
'/Ĵ/' => 'J',
'/ĵ/' => 'j',
- '/Ķ/' => 'K',
- '/ķ/' => 'k',
- '/Ĺ|Ļ|Ľ|Ŀ|Ł/' => 'L',
- '/ĺ|ļ|ľ|ŀ|ł/' => 'l',
- '/Ñ|Ń|Ņ|Ň/' => 'N',
- '/ñ|ń|ņ|ň|ʼn/' => 'n',
- '/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ/' => 'O',
- '/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º/' => 'o',
- '/Ŕ|Ŗ|Ř/' => 'R',
- '/ŕ|ŗ|ř/' => 'r',
- '/Ś|Ŝ|Ş|Š/' => 'S',
- '/ś|ŝ|ş|š|ſ/' => 's',
- '/Ţ|Ť|Ŧ/' => 'T',
+ '/Ķ|Κ/' => 'K',
+ '/ķ|κ/' => 'k',
+ '/Ĺ|Ļ|Ľ|Ŀ|Ł|Λ/' => 'L',
+ '/ĺ|ļ|ľ|ŀ|ł|λ/' => 'l',
+ '/Ñ|Ń|Ņ|Ň|Ν/' => 'N',
+ '/ñ|ń|ņ|ň|ʼn|ν/' => 'n',
+ '/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ|Ο|Ό|Ω|Ώ/' => 'O',
+ '/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º|ο|ό|ω|ώ/' => 'o',
+ '/Ŕ|Ŗ|Ř|Ρ/' => 'R',
+ '/ŕ|ŗ|ř|ρ/' => 'r',
+ '/Ś|Ŝ|Ş|Š|Σ/' => 'S',
+ '/ś|ŝ|ş|š|ſ|σ|ς/' => 's',
+ '/Ţ|Ť|Ŧ|τ/' => 'T',
'/ţ|ť|ŧ/' => 't',
'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ/' => 'U',
- '/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ/' => 'u',
- '/Ý|Ÿ|Ŷ/' => 'Y',
+ '/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ/' => 'u',
+ '/Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ/' => 'Y',
'/ý|ÿ|ŷ/' => 'y',
'/Ŵ/' => 'W',
'/ŵ/' => 'w',
- '/Ź|Ż|Ž/' => 'Z',
- '/ź|ż|ž/' => 'z',
+ '/Ź|Ż|Ž|Ζ/' => 'Z',
+ '/ź|ż|ž|ζ/' => 'z',
'/Æ|Ǽ/' => 'AE',
'/ß/'=> 'ss',
'/IJ/' => 'IJ',
'/ij/' => 'ij',
'/Œ/' => 'OE',
- '/ƒ/' => 'f'
+ '/ƒ/' => 'f',
+ '/ξ/' => 'ks',
+ '/π/' => 'p',
+ '/β/' => 'v',
+ '/μ/' => 'm',
+ '/ψ/' => 'ps',
);
/* End of file foreign_chars.php */
--
cgit v1.2.3-24-g4f1b
From 07f09ac02a0e23a863b34aa1bdc03f501303f659 Mon Sep 17 00:00:00 2001
From: George Petsagourakis
Date: Tue, 24 Apr 2012 20:09:29 +0300
Subject: Added Romanian characters to the foreign_chars.php fixes #131
---
application/config/foreign_chars.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'application')
diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php
index be97b6310..41de123da 100644
--- a/application/config/foreign_chars.php
+++ b/application/config/foreign_chars.php
@@ -66,10 +66,10 @@ $foreign_characters = array(
'/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º|ο|ό|ω|ώ/' => 'o',
'/Ŕ|Ŗ|Ř|Ρ/' => 'R',
'/ŕ|ŗ|ř|ρ/' => 'r',
- '/Ś|Ŝ|Ş|Š|Σ/' => 'S',
- '/ś|ŝ|ş|š|ſ|σ|ς/' => 's',
- '/Ţ|Ť|Ŧ|τ/' => 'T',
- '/ţ|ť|ŧ/' => 't',
+ '/Ś|Ŝ|Ş|Ș|Š|Σ/' => 'S',
+ '/ś|ŝ|ş|ș|š|ſ|σ|ς/' => 's',
+ '/Ț|Ţ|Ť|Ŧ|τ/' => 'T',
+ '/ț|ţ|ť|ŧ/' => 't',
'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ/' => 'U',
'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ/' => 'u',
'/Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ/' => 'Y',
--
cgit v1.2.3-24-g4f1b
From 43ef706d3684af7efa02c21db02ca150c9b424a9 Mon Sep 17 00:00:00 2001
From: dixy
Date: Sat, 5 May 2012 18:26:54 +0200
Subject: Remove -webkit prefix for box-shadow
---
application/errors/error_404.php | 2 +-
application/errors/error_db.php | 2 +-
application/errors/error_general.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'application')
diff --git a/application/errors/error_404.php b/application/errors/error_404.php
index 746032956..c19bedfcd 100644
--- a/application/errors/error_404.php
+++ b/application/errors/error_404.php
@@ -72,7 +72,7 @@ code {
#container {
margin: 10px;
border: 1px solid #D0D0D0;
- -webkit-box-shadow: 0 0 8px #D0D0D0;
+ box-shadow: 0 0 8px #D0D0D0;
}
p {
diff --git a/application/errors/error_db.php b/application/errors/error_db.php
index eb3a75260..3b244e094 100644
--- a/application/errors/error_db.php
+++ b/application/errors/error_db.php
@@ -72,7 +72,7 @@ code {
#container {
margin: 10px;
border: 1px solid #D0D0D0;
- -webkit-box-shadow: 0 0 8px #D0D0D0;
+ box-shadow: 0 0 8px #D0D0D0;
}
p {
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
index 59896e1ea..c88afe168 100644
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -72,7 +72,7 @@ code {
#container {
margin: 10px;
border: 1px solid #D0D0D0;
- -webkit-box-shadow: 0 0 8px #D0D0D0;
+ box-shadow: 0 0 8px #D0D0D0;
}
p {
--
cgit v1.2.3-24-g4f1b
From ca7d822f224033196e0e327944a01f319c90f37f Mon Sep 17 00:00:00 2001
From: Andrey Andreev
Date: Fri, 11 May 2012 10:59:09 +0300
Subject: User_agent library improvements
---
application/config/user_agents.php | 147 +++++++++++++++++++------------------
1 file changed, 76 insertions(+), 71 deletions(-)
(limited to 'application')
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 60f256e01..72d74dbc7 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -36,7 +36,7 @@
|
*/
-$platforms = array (
+$platforms = array(
'windows nt 6.1' => 'Windows 7',
'windows nt 6.0' => 'Windows Vista',
'windows nt 5.2' => 'Windows 2003',
@@ -51,6 +51,11 @@ $platforms = array (
'windows 95' => 'Windows 95',
'win95' => 'Windows 95',
'windows' => 'Unknown Windows OS',
+ 'android' => 'Android',
+ 'blackberry' => 'BlackBerry',
+ 'iphone' => 'iOS',
+ 'ipad' => 'iOS',
+ 'ipod' => 'iOS',
'os x' => 'Mac OS X',
'ppc mac' => 'Power PC Mac',
'freebsd' => 'FreeBSD',
@@ -117,84 +122,84 @@ $mobiles = array(
// 'motorola' => 'Motorola'
// Phones and Manufacturers
- 'motorola' => "Motorola",
- 'nokia' => "Nokia",
- 'palm' => "Palm",
- 'iphone' => "Apple iPhone",
- 'ipad' => "iPad",
- 'ipod' => "Apple iPod Touch",
- 'sony' => "Sony Ericsson",
- 'ericsson' => "Sony Ericsson",
- 'blackberry' => "BlackBerry",
- 'cocoon' => "O2 Cocoon",
- 'blazer' => "Treo",
- 'lg' => "LG",
- 'amoi' => "Amoi",
- 'xda' => "XDA",
- 'mda' => "MDA",
- 'vario' => "Vario",
- 'htc' => "HTC",
- 'samsung' => "Samsung",
- 'sharp' => "Sharp",
- 'sie-' => "Siemens",
- 'alcatel' => "Alcatel",
- 'benq' => "BenQ",
- 'ipaq' => "HP iPaq",
- 'mot-' => "Motorola",
- 'playstation portable' => "PlayStation Portable",
- 'hiptop' => "Danger Hiptop",
- 'nec-' => "NEC",
- 'panasonic' => "Panasonic",
- 'philips' => "Philips",
- 'sagem' => "Sagem",
- 'sanyo' => "Sanyo",
- 'spv' => "SPV",
- 'zte' => "ZTE",
- 'sendo' => "Sendo",
- 'dsi' => "Nintendo DSi",
- 'ds' => "Nintendo DS",
- 'wii' => "Nintendo Wii",
- '3ds' => "Nintendo 3DS",
- 'open web' => "Open Web",
- 'openweb' => "OpenWeb",
+ 'motorola' => 'Motorola',
+ 'nokia' => 'Nokia',
+ 'palm' => 'Palm',
+ 'iphone' => 'Apple iPhone',
+ 'ipad' => 'iPad',
+ 'ipod' => 'Apple iPod Touch',
+ 'sony' => 'Sony Ericsson',
+ 'ericsson' => 'Sony Ericsson',
+ 'blackberry' => 'BlackBerry',
+ 'cocoon' => 'O2 Cocoon',
+ 'blazer' => 'Treo',
+ 'lg' => 'LG',
+ 'amoi' => 'Amoi',
+ 'xda' => 'XDA',
+ 'mda' => 'MDA',
+ 'vario' => 'Vario',
+ 'htc' => 'HTC',
+ 'samsung' => 'Samsung',
+ 'sharp' => 'Sharp',
+ 'sie-' => 'Siemens',
+ 'alcatel' => 'Alcatel',
+ 'benq' => 'BenQ',
+ 'ipaq' => 'HP iPaq',
+ 'mot-' => 'Motorola',
+ 'playstation portable' => 'PlayStation Portable',
+ 'hiptop' => 'Danger Hiptop',
+ 'nec-' => 'NEC',
+ 'panasonic' => 'Panasonic',
+ 'philips' => 'Philips',
+ 'sagem' => 'Sagem',
+ 'sanyo' => 'Sanyo',
+ 'spv' => 'SPV',
+ 'zte' => 'ZTE',
+ 'sendo' => 'Sendo',
+ 'dsi' => 'Nintendo DSi',
+ 'ds' => 'Nintendo DS',
+ 'wii' => 'Nintendo Wii',
+ '3ds' => 'Nintendo 3DS',
+ 'open web' => 'Open Web',
+ 'openweb' => 'OpenWeb',
// Operating Systems
- 'android' => "Android",
- 'symbian' => "Symbian",
- 'SymbianOS' => "SymbianOS",
- 'elaine' => "Palm",
- 'palm' => "Palm",
- 'series60' => "Symbian S60",
- 'windows ce' => "Windows CE",
+ 'android' => 'Android',
+ 'symbian' => 'Symbian',
+ 'SymbianOS' => 'SymbianOS',
+ 'elaine' => 'Palm',
+ 'palm' => 'Palm',
+ 'series60' => 'Symbian S60',
+ 'windows ce' => 'Windows CE',
// Browsers
- 'obigo' => "Obigo",
- 'netfront' => "Netfront Browser",
- 'openwave' => "Openwave Browser",
- 'mobilexplorer' => "Mobile Explorer",
- 'operamini' => "Opera Mini",
- 'opera mini' => "Opera Mini",
- 'opera mobi' => "Opera Mobile",
+ 'obigo' => 'Obigo',
+ 'netfront' => 'Netfront Browser',
+ 'openwave' => 'Openwave Browser',
+ 'mobilexplorer' => 'Mobile Explorer',
+ 'operamini' => 'Opera Mini',
+ 'opera mini' => 'Opera Mini',
+ 'opera mobi' => 'Opera Mobile',
// Other
- 'digital paths' => "Digital Paths",
- 'avantgo' => "AvantGo",
- 'xiino' => "Xiino",
- 'novarra' => "Novarra Transcoder",
- 'vodafone' => "Vodafone",
- 'docomo' => "NTT DoCoMo",
- 'o2' => "O2",
+ 'digital paths' => 'Digital Paths',
+ 'avantgo' => 'AvantGo',
+ 'xiino' => 'Xiino',
+ 'novarra' => 'Novarra Transcoder',
+ 'vodafone' => 'Vodafone',
+ 'docomo' => 'NTT DoCoMo',
+ 'o2' => 'O2',
// Fallback
- 'mobile' => "Generic Mobile",
- 'wireless' => "Generic Mobile",
- 'j2me' => "Generic Mobile",
- 'midp' => "Generic Mobile",
- 'cldc' => "Generic Mobile",
- 'up.link' => "Generic Mobile",
- 'up.browser' => "Generic Mobile",
- 'smartphone' => "Generic Mobile",
- 'cellphone' => "Generic Mobile"
+ 'mobile' => 'Generic Mobile',
+ 'wireless' => 'Generic Mobile',
+ 'j2me' => 'Generic Mobile',
+ 'midp' => 'Generic Mobile',
+ 'cldc' => 'Generic Mobile',
+ 'up.link' => 'Generic Mobile',
+ 'up.browser' => 'Generic Mobile',
+ 'smartphone' => 'Generic Mobile',
+ 'cellphone' => 'Generic Mobile'
);
// There are hundreds of bots but these are the most common.
--
cgit v1.2.3-24-g4f1b
From 585cf67a98d8a31f584c13a319310ca7561d572c Mon Sep 17 00:00:00 2001
From: Andrey Andreev
Date: Fri, 11 May 2012 11:55:15 +0300
Subject: Remove a duplicate mobile user agent entry
---
application/config/user_agents.php | 1 -
1 file changed, 1 deletion(-)
(limited to 'application')
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 72d74dbc7..76114616b 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -168,7 +168,6 @@ $mobiles = array(
'symbian' => 'Symbian',
'SymbianOS' => 'SymbianOS',
'elaine' => 'Palm',
- 'palm' => 'Palm',
'series60' => 'Symbian S60',
'windows ce' => 'Windows CE',
--
cgit v1.2.3-24-g4f1b
From 09069ddcecde9a0c66e41087e816567d420eb750 Mon Sep 17 00:00:00 2001
From: Timothy Warren
Date: Mon, 14 May 2012 15:21:33 -0400
Subject: Move errors to views folder
---
application/errors/error_404.php | 89 ------------------------------
application/errors/error_db.php | 89 ------------------------------
application/errors/error_general.php | 89 ------------------------------
application/errors/error_php.php | 55 ------------------
application/errors/index.html | 10 ----
application/views/errors/error_404.php | 89 ++++++++++++++++++++++++++++++
application/views/errors/error_db.php | 89 ++++++++++++++++++++++++++++++
application/views/errors/error_general.php | 89 ++++++++++++++++++++++++++++++
application/views/errors/error_php.php | 55 ++++++++++++++++++
application/views/errors/index.html | 10 ++++
10 files changed, 332 insertions(+), 332 deletions(-)
delete mode 100644 application/errors/error_404.php
delete mode 100644 application/errors/error_db.php
delete mode 100644 application/errors/error_general.php
delete mode 100644 application/errors/error_php.php
delete mode 100644 application/errors/index.html
create mode 100644 application/views/errors/error_404.php
create mode 100644 application/views/errors/error_db.php
create mode 100644 application/views/errors/error_general.php
create mode 100644 application/views/errors/error_php.php
create mode 100644 application/views/errors/index.html
(limited to 'application')
diff --git a/application/errors/error_404.php b/application/errors/error_404.php
deleted file mode 100644
index c19bedfcd..000000000
--- a/application/errors/error_404.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-404 Page Not Found
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/application/errors/error_db.php b/application/errors/error_db.php
deleted file mode 100644
index 3b244e094..000000000
--- a/application/errors/error_db.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-Database Error
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
deleted file mode 100644
index c88afe168..000000000
--- a/application/errors/error_general.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-Error
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/application/errors/error_php.php b/application/errors/error_php.php
deleted file mode 100644
index 3855720de..000000000
--- a/application/errors/error_php.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
A PHP Error was encountered
-
-
Severity:
-
Message:
-
Filename:
-
Line Number:
-
-
-
-
Backtrace:
-
-
-
-
- File:
- Line:
- Function:
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/application/errors/index.html b/application/errors/index.html
deleted file mode 100644
index c942a79ce..000000000
--- a/application/errors/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- 403 Forbidden
-
-
-
-Directory access is forbidden.
-
-
-
\ No newline at end of file
diff --git a/application/views/errors/error_404.php b/application/views/errors/error_404.php
new file mode 100644
index 000000000..c19bedfcd
--- /dev/null
+++ b/application/views/errors/error_404.php
@@ -0,0 +1,89 @@
+
+
+
+
+404 Page Not Found
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/views/errors/error_db.php b/application/views/errors/error_db.php
new file mode 100644
index 000000000..3b244e094
--- /dev/null
+++ b/application/views/errors/error_db.php
@@ -0,0 +1,89 @@
+
+
+
+
+Database Error
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/views/errors/error_general.php b/application/views/errors/error_general.php
new file mode 100644
index 000000000..c88afe168
--- /dev/null
+++ b/application/views/errors/error_general.php
@@ -0,0 +1,89 @@
+
+
+
+
+Error
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/views/errors/error_php.php b/application/views/errors/error_php.php
new file mode 100644
index 000000000..3855720de
--- /dev/null
+++ b/application/views/errors/error_php.php
@@ -0,0 +1,55 @@
+
+
+
+
+
A PHP Error was encountered
+
+
Severity:
+
Message:
+
Filename:
+
Line Number:
+
+
+
+
Backtrace:
+
+
+
+
+ File:
+ Line:
+ Function:
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/views/errors/index.html b/application/views/errors/index.html
new file mode 100644
index 000000000..c942a79ce
--- /dev/null
+++ b/application/views/errors/index.html
@@ -0,0 +1,10 @@
+
+
+ 403 Forbidden
+
+
+
+Directory access is forbidden.
+
+
+
\ No newline at end of file
--
cgit v1.2.3-24-g4f1b
From 04d4091dfa551475998c351e09858e5ebdcf4482 Mon Sep 17 00:00:00 2001
From: Alan Jenkins
Date: Mon, 30 Apr 2012 16:04:43 +0100
Subject: fix backtrace filtering
The backtrace was filtered to remove CI system files,
but the filter was buggy. It would also filter out
application files which happened to contain the string "system"...
or ALL files, if the application directory is under /system/
(Perhaps the latter comes as a surprise, but it's explicitly
mentioned in index.php and ).
Instead, we should test whether the file is underneath BASEPATH
(using realpath() to make sure we have the same sort of slashes).
---
application/errors/error_php.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'application')
diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index 3855720de..b76dc8a9e 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -40,12 +40,15 @@
Backtrace:
-
+
+
File:
Line:
Function:
+
--
cgit v1.2.3-24-g4f1b
From 1ef19196e32d081bd5db1a7f87599acea0ecac6e Mon Sep 17 00:00:00 2001
From: Alex Bilbie
Date: Thu, 17 May 2012 20:41:12 +0100
Subject: Changed the default controller route to use single quotes instead of
double quotes
---
application/config/routes.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'application')
diff --git a/application/config/routes.php b/application/config/routes.php
index 474bda969..001198615 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -64,7 +64,7 @@
|
*/
-$route['default_controller'] = "welcome";
+$route['default_controller'] = 'welcome';
$route['404_override'] = '';
/* End of file routes.php */
--
cgit v1.2.3-24-g4f1b
From beea5dc4bdb244da4789d4d1a99065099ef51a1e Mon Sep 17 00:00:00 2001
From: Alex Bilbie
Date: Sat, 2 Jun 2012 11:13:54 +0100
Subject: Replaced `==` with `===` in /application/views/welcome_message.php
---
application/views/welcome_message.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'application')
diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index 45360da60..65f62a922 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -107,7 +107,7 @@
If you are exploring CodeIgniter for the very first time, you should start by reading the User Guide.
-
+