Permalink
Browse files

Fixed conflicts with recent develop changes.

  • Loading branch information...
2 parents c719b29 + b7f1912 commit 622abeeffdf8e60e0d40f90d1090dc4d987fd53e Phil Sturgeon committed May 4, 2012
Showing with 9,543 additions and 7,911 deletions.
  1. +12 −2 .travis.yml
  2. +3 −3 application/config/autoload.php
  3. +3 −3 application/config/config.php
  4. +5 −5 application/config/constants.php
  5. +28 −25 application/config/database.php
  6. +22 −12 application/config/doctypes.php
  7. +37 −32 application/config/foreign_chars.php
  8. +3 −4 application/config/hooks.php
  9. +3 −3 application/config/migration.php
  10. +3 −2 application/config/mimes.php
  11. +3 −4 application/config/profiler.php
  12. +3 −4 application/config/routes.php
  13. +3 −3 application/config/smileys.php
  14. +2 −2 application/config/user_agents.php
  15. +5 −5 application/controllers/welcome.php
  16. +4 −6 application/errors/error_404.php
  17. +4 −6 application/errors/error_db.php
  18. +4 −6 application/errors/error_general.php
  19. +7 −7 application/errors/error_php.php
  20. +6 −8 application/views/welcome_message.php
  21. +21 −0 phpdoc.dist.xml
  22. +4 −7 system/core/Benchmark.php
  23. +23 −18 system/core/CodeIgniter.php
  24. +171 −169 system/core/Common.php
  25. +6 −12 system/core/Config.php
  26. +14 −3 system/core/Controller.php
  27. +20 −25 system/core/Exceptions.php
  28. +16 −22 system/core/Hooks.php
  29. +121 −100 system/core/Input.php
  30. +21 −15 system/core/Lang.php
  31. +61 −53 system/core/Loader.php
  32. +4 −3 system/core/Model.php
  33. +47 −19 system/core/Output.php
  34. +26 −23 system/core/Router.php
  35. +51 −48 system/core/Security.php
  36. +10 −6 system/core/URI.php
  37. +1 −3 system/core/Utf8.php
  38. +29 −28 system/database/DB.php
  39. +1 −1 system/database/DB_cache.php
  40. +181 −167 system/database/DB_driver.php
  41. +51 −10 system/database/DB_forge.php
  42. +393 −262 system/database/{DB_active_rec.php → DB_query_builder.php}
  43. +11 −12 system/database/DB_result.php
  44. +60 −60 system/database/DB_utility.php
  45. +81 −279 system/database/drivers/cubrid/cubrid_driver.php
  46. +37 −124 system/database/drivers/cubrid/cubrid_forge.php
  47. +15 −49 system/database/drivers/cubrid/cubrid_result.php
  48. +6 −50 system/database/drivers/cubrid/cubrid_utility.php
  49. +21 −83 system/database/drivers/interbase/interbase_driver.php
  50. +20 −39 system/database/drivers/interbase/interbase_forge.php
  51. +0 −17 system/database/drivers/interbase/interbase_result.php
  52. +7 −60 system/database/drivers/interbase/interbase_utility.php
  53. +29 −96 system/database/drivers/mssql/mssql_driver.php
  54. +4 −58 system/database/drivers/mssql/mssql_forge.php
  55. +2 −2 system/database/drivers/mssql/mssql_result.php
  56. +3 −42 system/database/drivers/mssql/mssql_utility.php
  57. +2 −172 system/database/drivers/mysql/mysql_driver.php
  58. +3 −56 system/database/drivers/mysql/mysql_forge.php
  59. +1 −1 system/database/drivers/mysql/mysql_result.php
  60. +4 −41 system/database/drivers/mysql/mysql_utility.php
  61. +17 −179 system/database/drivers/mysqli/mysqli_driver.php
  62. +4 −56 system/database/drivers/mysqli/mysqli_forge.php
  63. +10 −10 system/database/drivers/mysqli/mysqli_result.php
  64. +4 −42 system/database/drivers/mysqli/mysqli_utility.php
  65. +133 −187 system/database/drivers/oci8/oci8_driver.php
  66. +13 −81 system/database/drivers/oci8/oci8_forge.php
  67. +497 −25 system/database/drivers/oci8/oci8_result.php
  68. +2 −42 system/database/drivers/oci8/oci8_utility.php
  69. +14 −147 system/database/drivers/odbc/odbc_driver.php
  70. +5 −74 system/database/drivers/odbc/odbc_forge.php
  71. +0 −16 system/database/drivers/odbc/odbc_result.php
  72. +2 −57 system/database/drivers/odbc/odbc_utility.php
  73. +51 −258 system/database/drivers/pdo/pdo_driver.php
  74. +6 −75 system/database/drivers/pdo/pdo_forge.php
  75. +0 −17 system/database/drivers/pdo/pdo_result.php
  76. +2 −57 system/database/drivers/pdo/pdo_utility.php
  77. +109 −181 system/database/drivers/postgre/postgre_driver.php
  78. +23 −102 system/database/drivers/postgre/postgre_forge.php
  79. +9 −11 system/database/drivers/postgre/postgre_result.php
  80. +3 −38 system/database/drivers/postgre/postgre_utility.php
  81. +13 −133 system/database/drivers/sqlite/sqlite_driver.php
  82. +9 −44 system/database/drivers/sqlite/sqlite_forge.php
  83. +13 −35 system/database/drivers/sqlite/sqlite_result.php
  84. +2 −45 system/database/drivers/sqlite/sqlite_utility.php
  85. +10 −0 system/database/drivers/sqlite3/index.html
  86. +431 −0 system/database/drivers/sqlite3/sqlite3_driver.php
  87. +195 −0 system/database/drivers/sqlite3/sqlite3_forge.php
  88. +615 −0 system/database/drivers/sqlite3/sqlite3_result.php
  89. +54 −0 system/database/drivers/sqlite3/sqlite3_utility.php
  90. +37 −67 system/database/drivers/sqlsrv/sqlsrv_driver.php
  91. +4 −57 system/database/drivers/sqlsrv/sqlsrv_forge.php
  92. +0 −16 system/database/drivers/sqlsrv/sqlsrv_result.php
  93. +4 −43 system/database/drivers/sqlsrv/sqlsrv_utility.php
  94. +29 −29 system/helpers/array_helper.php
  95. +55 −106 system/helpers/captcha_helper.php
  96. +33 −33 system/helpers/cookie_helper.php
  97. +127 −142 system/helpers/date_helper.php
  98. +13 −12 system/helpers/directory_helper.php
  99. +14 −12 system/helpers/download_helper.php
  100. +15 −15 system/helpers/email_helper.php
  101. +106 −114 system/helpers/file_helper.php
  102. +310 −354 system/helpers/form_helper.php
  103. +107 −122 system/helpers/html_helper.php
  104. +11 −9 system/helpers/inflector_helper.php
  105. +2 −5 system/helpers/language_helper.php
  106. +1 −4 system/helpers/number_helper.php
  107. +1 −2 system/helpers/path_helper.php
  108. +1 −1 system/helpers/security_helper.php
  109. +46 −85 system/helpers/smiley_helper.php
  110. +54 −80 system/helpers/string_helper.php
  111. +90 −93 system/helpers/text_helper.php
  112. +1 −7 system/helpers/typography_helper.php
  113. +22 −37 system/helpers/url_helper.php
  114. +6 −8 system/helpers/xml_helper.php
  115. +78 −71 system/libraries/Cache/Cache.php
  116. +19 −24 system/libraries/Cache/drivers/Cache_apc.php
  117. +15 −22 system/libraries/Cache/drivers/Cache_dummy.php
  118. +27 −27 system/libraries/Cache/drivers/Cache_file.php
  119. +44 −41 system/libraries/Cache/drivers/Cache_memcached.php
  120. +3 −6 system/libraries/Cache/drivers/Cache_wincache.php
  121. +95 −58 system/libraries/Calendar.php
  122. +56 −36 system/libraries/Cart.php
  123. +62 −33 system/libraries/Driver.php
  124. +27 −16 system/libraries/Email.php
  125. +47 −13 system/libraries/Encrypt.php
  126. +176 −157 system/libraries/Form_validation.php
  127. +41 −68 system/libraries/Ftp.php
  128. +302 −21 system/libraries/Image_lib.php
  129. +18 −29 system/libraries/Javascript.php
  130. +50 −9 system/libraries/Log.php
  131. +47 −18 system/libraries/Migration.php
  132. +22 −33 system/libraries/Pagination.php
  133. +34 −31 system/libraries/Parser.php
  134. +123 −95 system/libraries/Profiler.php
  135. +138 −6 system/libraries/Session.php
  136. +107 −70 system/libraries/Table.php
  137. +42 −58 system/libraries/Trackback.php
  138. +50 −39 system/libraries/Typography.php
  139. +12 −16 system/libraries/Unit_test.php
  140. +146 −182 system/libraries/Upload.php
  141. +132 −42 system/libraries/User_agent.php
  142. +518 −361 system/libraries/Xmlrpc.php
  143. +50 −47 system/libraries/Xmlrpcs.php
  144. +110 −90 system/libraries/Zip.php
  145. +4 −4 tests/Bootstrap.php
  146. +1 −4 tests/codeigniter/core/Common_test.php
  147. +1 −37 tests/codeigniter/core/Loader_test.php
  148. +1 −32 tests/codeigniter/core/URI_test.php
  149. +36 −0 tests/codeigniter/database/DB_driver_test.php
  150. +49 −0 tests/codeigniter/database/DB_test.php
  151. +53 −0 tests/codeigniter/database/query_builder/get_test.php
  152. +67 −0 tests/codeigniter/database/query_builder/insert_test.php
  153. +95 −0 tests/codeigniter/database/query_builder/select_test.php
  154. +4 −6 tests/codeigniter/helpers/array_helper_test.php
  155. +7 −3 tests/codeigniter/helpers/date_helper_test.php
  156. +4 −5 tests/codeigniter/helpers/directory_helper_test.php
  157. +6 −4 tests/codeigniter/helpers/email_helper_test.php
  158. +3 −4 tests/codeigniter/helpers/file_helper_test.php
  159. +252 −0 tests/codeigniter/helpers/form_helper_test.php
  160. +5 −3 tests/codeigniter/helpers/html_helper_test.php
  161. +4 −2 tests/codeigniter/helpers/inflector_helper_test.php
  162. +3 −4 tests/codeigniter/helpers/number_helper_test.php
  163. +6 −3 tests/codeigniter/helpers/path_helper_test.php
  164. +6 −3 tests/codeigniter/helpers/string_helper_test.php
  165. +3 −3 tests/codeigniter/helpers/text_helper_test.php
  166. +6 −3 tests/codeigniter/helpers/url_helper_test.php
  167. +5 −3 tests/codeigniter/helpers/xml_helper_test.php
  168. +2 −5 tests/codeigniter/libraries/Parser_test.php
  169. +13 −61 tests/codeigniter/libraries/Table_test.php
  170. +2 −5 tests/codeigniter/libraries/Typography_test.php
  171. +3 −7 tests/codeigniter/libraries/{User_agent_test.php → Useragent_test.php}
  172. +90 −0 tests/mocks/autoloader.php
  173. +17 −15 tests/{lib → mocks}/ci_testcase.php
  174. +1 −1 tests/{lib → mocks/core}/common.php
  175. +30 −0 tests/mocks/core/loader.php
  176. +25 −0 tests/mocks/core/uri.php
  177. BIN tests/mocks/database/ci_test.sqlite
  178. +34 −0 tests/mocks/database/config/mysql.php
  179. +37 −0 tests/mocks/database/config/pdo/mysql.php
  180. +37 −0 tests/mocks/database/config/pdo/pgsql.php
  181. +37 −0 tests/mocks/database/config/pdo/sqlite.php
  182. +34 −0 tests/mocks/database/config/pgsql.php
  183. +34 −0 tests/mocks/database/config/sqlite.php
  184. +100 −0 tests/mocks/database/db.php
  185. +36 −0 tests/mocks/database/db/driver.php
  186. +10 −0 tests/mocks/database/db/querybuilder.php
  187. +16 −0 tests/mocks/database/drivers/mysql.php
  188. +16 −0 tests/mocks/database/drivers/pdo.php
  189. +16 −0 tests/mocks/database/drivers/postgre.php
  190. +16 −0 tests/mocks/database/drivers/sqlite.php
  191. +98 −0 tests/mocks/database/schema/skeleton.php
  192. +3 −0 tests/mocks/libraries/parser.php
  193. +15 −0 tests/mocks/libraries/table.php
  194. +3 −0 tests/mocks/libraries/typography.php
  195. +3 −0 tests/mocks/libraries/useragent.php
  196. +0 −38 tests/phpunit.xml
  197. +32 −0 tests/travis/mysql.phpunit.xml
  198. +32 −0 tests/travis/pdo/mysql.phpunit.xml
  199. +32 −0 tests/travis/pdo/pgsql.phpunit.xml
  200. +32 −0 tests/travis/pdo/sqlite.phpunit.xml
  201. +32 −0 tests/travis/pgsql.phpunit.xml
  202. +32 −0 tests/travis/sqlite.phpunit.xml
  203. +67 −17 user_guide_src/source/changelog.rst
  204. +1 −1 user_guide_src/source/conf.py
  205. +12 −12 user_guide_src/source/database/configuration.rst
  206. +1 −1 user_guide_src/source/database/connecting.rst
  207. +4 −4 user_guide_src/source/database/examples.rst
  208. +2 −2 user_guide_src/source/database/index.rst
  209. +1 −1 user_guide_src/source/database/queries.rst
  210. +18 −18 user_guide_src/source/database/{active_record.rst → query_builder.rst}
  211. +1 −1 user_guide_src/source/database/utilities.rst
  212. +1 −1 user_guide_src/source/general/models.rst
  213. +1 −1 user_guide_src/source/general/requirements.rst
  214. +13 −3 user_guide_src/source/general/styleguide.rst
  215. +11 −11 user_guide_src/source/general/views.rst
  216. +92 −60 user_guide_src/source/helpers/date_helper.rst
  217. +1 −1 user_guide_src/source/helpers/directory_helper.rst
  218. +41 −21 user_guide_src/source/helpers/html_helper.rst
  219. +10 −0 user_guide_src/source/installation/upgrade_300.rst
  220. +14 −5 user_guide_src/source/libraries/email.rst
  221. +8 −8 user_guide_src/source/libraries/file_uploading.rst
  222. +8 −7 user_guide_src/source/libraries/form_validation.rst
  223. +2 −2 user_guide_src/source/libraries/javascript.rst
  224. +9 −0 user_guide_src/source/libraries/output.rst
  225. +15 −13 user_guide_src/source/libraries/xmlrpc.rst
  226. +1 −1 user_guide_src/source/overview/features.rst
  227. +1 −1 user_guide_src/source/tutorial/create_news_items.rst
  228. +1 −1 user_guide_src/source/tutorial/index.rst
  229. +2 −2 user_guide_src/source/tutorial/news_section.rst
View
@@ -1,16 +1,26 @@
language: php
php:
- - 5.2
- 5.3
- 5.4
+env:
+ - DB=mysql
+ - DB=pgsql
+ - DB=sqlite
+ - DB=pdo/mysql
+ - DB=pdo/pgsql
+ - DB=pdo/sqlite
+
before_script:
- pyrus channel-discover pear.php-tools.net
- pyrus install http://pear.php-tools.net/get/vfsStream-0.11.2.tgz
- phpenv rehash
+ - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi"
-script: phpunit --configuration tests/phpunit.xml
+script: phpunit --configuration tests/travis/$DB.phpunit.xml
branches:
only:
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
* An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
* An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
* An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -66,8 +66,8 @@
| Display Debug backtrace
|--------------------------------------------------------------------------
|
-| If set to TRUE, a backtrace will be displayed along with php errors. If
-| error_reporting is disabled, the backtrace will not display, regardless
+| If set to TRUE, a backtrace will be displayed along with php errors. If
+| error_reporting is disabled, the backtrace will not display, regardless
| of this setting
|
*/
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
* An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -43,9 +43,10 @@
| ['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
+| 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,30 +69,32 @@
| 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';
-$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 */
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
* An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -26,15 +26,25 @@
*/
$_doctypes = array(
- 'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
- 'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
- 'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
- 'xhtml1-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
- 'xhtml-basic11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
- 'html5' => '<!DOCTYPE html>',
- 'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
- 'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
- 'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
+ 'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
+ 'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+ 'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
+ 'xhtml1-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
+ 'xhtml-basic11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
+ 'html5' => '<!DOCTYPE html>',
+ 'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
+ 'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+ 'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+ 'mathml1' => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
+ 'mathml2' => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
+ 'svg10' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
+ 'svg11' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
+ 'svg11-basic' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
+ 'svg11-tiny' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
+ 'xhtml-math-svg-xh' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
+ 'xhtml-math-svg-sh' => '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
+ 'xhtml-rdfa-1' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
+ 'xhtml-rdfa-2' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">'
);
/* End of file doctypes.php */
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
* An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -40,50 +40,55 @@
'/Ä/' => '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',
- '/ţ|ť|ŧ/' => '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 */
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
* An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -37,6 +37,5 @@
*/
-
/* End of file hooks.php */
/* Location: ./application/config/hooks.php */
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -89,5 +89,5 @@
*/
$config['migration_path'] = APPPATH . 'migrations/';
-
-/* End of file migration.php */
+/* End of file migration.php */
+/* Location: ./application/config/migration.php */
@@ -34,7 +34,8 @@
|
*/
-$mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'),
+$mimes = array(
+ 'hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'),
'cpt' => 'application/mac-compactpro',
'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
'bin' => array('application/macbinary', 'application/mac-binary', 'application/octet-stream', 'application/x-binary', 'application/x-macbinary'),
@@ -165,4 +166,4 @@
);
/* End of file mimes.php */
-/* Location: ./application/config/mimes.php */
+/* Location: ./application/config/mimes.php */
Oops, something went wrong.

0 comments on commit 622abee

Please sign in to comment.