Permalink
Browse files

Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	user_guide_src/source/changelog.rst

Signed-off-by: Jonathon Hill <jhill@brandmovers.com>
  • Loading branch information...
2 parents 275cf27 + a9ab46d commit 3978fc33d82dd7f778d1adbf30744f4dfac41c25 Jonathon Hill committed Nov 12, 2012
Showing with 10,770 additions and 4,698 deletions.
  1. +5 −5 application/config/config.php
  2. +54 −26 application/config/foreign_chars.php
  3. +2 −1 application/controllers/welcome.php
  4. +2 −1 application/views/errors/error_404.php
  5. +2 −1 application/views/errors/error_db.php
  6. +2 −1 application/views/errors/error_general.php
  7. +2 −1 application/views/errors/error_php.php
  8. +2 −1 application/views/welcome_message.php
  9. +1 −1 contributing.md
  10. +2 −1 system/core/Benchmark.php
  11. +47 −49 system/core/CodeIgniter.php
  12. +50 −2 system/core/Common.php
  13. +2 −1 system/core/Config.php
  14. +2 −1 system/core/Controller.php
  15. +2 −1 system/core/Exceptions.php
  16. +2 −1 system/core/Hooks.php
  17. +46 −8 system/core/Input.php
  18. +2 −1 system/core/Lang.php
  19. +71 −40 system/core/Loader.php
  20. +3 −2 system/{libraries → core}/Log.php
  21. +2 −1 system/core/Model.php
  22. +2 −1 system/core/Output.php
  23. +75 −69 system/core/Router.php
  24. +2 −1 system/core/Security.php
  25. +79 −49 system/core/URI.php
  26. +2 −1 system/core/Utf8.php
  27. +30 −16 system/database/DB.php
  28. +24 −7 system/database/DB_cache.php
  29. +271 −41 system/database/DB_driver.php
  30. +634 −72 system/database/DB_forge.php
  31. +333 −153 system/database/DB_query_builder.php
  32. +180 −23 system/database/DB_result.php
  33. +50 −27 system/database/DB_utility.php
  34. +46 −21 system/database/drivers/cubrid/cubrid_driver.php
  35. +124 −129 system/database/drivers/cubrid/cubrid_forge.php
  36. +5 −4 system/database/drivers/cubrid/cubrid_result.php
  37. +3 −2 system/database/drivers/cubrid/cubrid_utility.php
  38. +39 −23 system/database/drivers/ibase/ibase_driver.php
  39. +131 −83 system/database/drivers/ibase/ibase_forge.php
  40. +3 −2 system/database/drivers/ibase/ibase_result.php
  41. +3 −4 system/database/drivers/ibase/ibase_utility.php
  42. +63 −21 system/database/drivers/mssql/mssql_driver.php
  43. +70 −94 system/database/drivers/mssql/mssql_forge.php
  44. +5 −4 system/database/drivers/mssql/mssql_result.php
  45. +16 −4 system/database/drivers/mssql/mssql_utility.php
  46. +59 −25 system/database/drivers/mysql/mysql_driver.php
  47. +117 −114 system/database/drivers/mysql/mysql_forge.php
  48. +7 −6 system/database/drivers/mysql/mysql_result.php
  49. +23 −3 system/database/drivers/mysql/mysql_utility.php
  50. +53 −24 system/database/drivers/mysqli/mysqli_driver.php
  51. +117 −114 system/database/drivers/mysqli/mysqli_forge.php
  52. +5 −4 system/database/drivers/mysqli/mysqli_result.php
  53. +23 −3 system/database/drivers/mysqli/mysqli_utility.php
  54. +93 −38 system/database/drivers/oci8/oci8_driver.php
  55. +63 −88 system/database/drivers/oci8/oci8_forge.php
  56. +32 −5 system/database/drivers/oci8/oci8_result.php
  57. +10 −4 system/database/drivers/oci8/oci8_utility.php
  58. +40 −21 system/database/drivers/odbc/odbc_driver.php
  59. +23 −107 system/database/drivers/odbc/odbc_forge.php
  60. +9 −8 system/database/drivers/odbc/odbc_result.php
  61. +5 −6 system/database/drivers/odbc/odbc_utility.php
  62. +39 −23 system/database/drivers/pdo/pdo_driver.php
  63. +8 −121 system/database/drivers/pdo/pdo_forge.php
  64. +4 −3 system/database/drivers/pdo/pdo_result.php
  65. +5 −6 system/database/drivers/pdo/pdo_utility.php
  66. +23 −13 system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
  67. +209 −0 system/database/drivers/pdo/subdrivers/pdo_4d_forge.php
  68. +23 −12 system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php
  69. +212 −0 system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php
  70. +58 −12 system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
  71. +136 −0 system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php
  72. +27 −17 system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
  73. +228 −0 system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php
  74. +22 −18 system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php
  75. +146 −0 system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php
  76. +20 −14 system/database/drivers/pdo/subdrivers/pdo_informix_driver.php
  77. +155 −0 system/database/drivers/pdo/subdrivers/pdo_informix_forge.php
  78. +33 −14 system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
  79. +218 −0 system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php
  80. +44 −18 system/database/drivers/pdo/subdrivers/pdo_oci_driver.php
  81. +133 −0 system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
  82. +36 −18 system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php
  83. +62 −0 system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php
  84. +32 −17 system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
  85. +194 −0 system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php
  86. +25 −15 system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php
  87. +229 −0 system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php
  88. +58 −12 system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
  89. +136 −0 system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php
  90. +41 −24 system/database/drivers/postgre/postgre_driver.php
  91. +112 −142 system/database/drivers/postgre/postgre_forge.php
  92. +5 −4 system/database/drivers/postgre/postgre_result.php
  93. +18 −4 system/database/drivers/postgre/postgre_utility.php
  94. +27 −15 system/database/drivers/sqlite/sqlite_driver.php
  95. +94 −101 system/database/drivers/sqlite/sqlite_forge.php
  96. +5 −4 system/database/drivers/sqlite/sqlite_result.php
  97. +5 −6 system/database/drivers/sqlite/sqlite_utility.php
  98. +26 −14 system/database/drivers/sqlite3/sqlite3_driver.php
  99. +105 −100 system/database/drivers/sqlite3/sqlite3_forge.php
  100. +6 −10 system/database/drivers/sqlite3/sqlite3_result.php
  101. +5 −6 system/database/drivers/sqlite3/sqlite3_utility.php
  102. +68 −22 system/database/drivers/sqlsrv/sqlsrv_driver.php
  103. +70 −94 system/database/drivers/sqlsrv/sqlsrv_forge.php
  104. +3 −2 system/database/drivers/sqlsrv/sqlsrv_result.php
  105. +18 −4 system/database/drivers/sqlsrv/sqlsrv_utility.php
  106. +2 −1 system/helpers/array_helper.php
  107. +2 −1 system/helpers/captcha_helper.php
  108. +2 −1 system/helpers/cookie_helper.php
  109. +7 −13 system/helpers/date_helper.php
  110. +9 −5 system/helpers/directory_helper.php
  111. +2 −1 system/helpers/download_helper.php
  112. +9 −6 system/helpers/email_helper.php
  113. +19 −18 system/helpers/file_helper.php
  114. +49 −38 system/helpers/form_helper.php
  115. +5 −4 system/helpers/html_helper.php
  116. +12 −12 system/helpers/inflector_helper.php
  117. +2 −1 system/helpers/language_helper.php
  118. +2 −1 system/helpers/number_helper.php
  119. +2 −1 system/helpers/path_helper.php
  120. +2 −1 system/helpers/security_helper.php
  121. +4 −4 system/helpers/smiley_helper.php
  122. +7 −3 system/helpers/string_helper.php
  123. +2 −1 system/helpers/text_helper.php
  124. +2 −1 system/helpers/typography_helper.php
  125. +12 −8 system/helpers/url_helper.php
  126. +2 −1 system/helpers/xml_helper.php
  127. +1 −0 system/language/english/calendar_lang.php
  128. +1 −0 system/language/english/date_lang.php
  129. +3 −2 system/language/english/db_lang.php
  130. +1 −0 system/language/english/email_lang.php
  131. +1 −0 system/language/english/form_validation_lang.php
  132. +1 −0 system/language/english/ftp_lang.php
  133. +1 −0 system/language/english/imglib_lang.php
  134. +1 −1 system/language/english/migration_lang.php
  135. +1 −0 system/language/english/number_lang.php
  136. +1 −0 system/language/english/profiler_lang.php
  137. +1 −0 system/language/english/unit_test_lang.php
  138. +1 −0 system/language/english/upload_lang.php
  139. +3 −2 system/libraries/Cache/Cache.php
  140. +3 −2 system/libraries/Cache/drivers/Cache_apc.php
  141. +3 −2 system/libraries/Cache/drivers/Cache_dummy.php
  142. +3 −2 system/libraries/Cache/drivers/Cache_file.php
  143. +3 −2 system/libraries/Cache/drivers/Cache_memcached.php
  144. +3 −2 system/libraries/Cache/drivers/Cache_redis.php
  145. +3 −2 system/libraries/Cache/drivers/Cache_wincache.php
  146. +2 −1 system/libraries/Calendar.php
  147. +3 −17 system/libraries/Cart.php
  148. +2 −1 system/libraries/Driver.php
  149. +316 −27 system/libraries/Email.php
  150. +2 −1 system/libraries/Encrypt.php
  151. +15 −9 system/libraries/Form_validation.php
  152. +76 −30 system/libraries/Ftp.php
  153. +13 −4 system/libraries/Image_lib.php
  154. +14 −6 system/libraries/Javascript.php
  155. +2 −1 system/libraries/Migration.php
  156. +261 −37 system/libraries/Pagination.php
  157. +2 −1 system/libraries/Parser.php
  158. +25 −9 system/libraries/Profiler.php
  159. +33 −3 system/libraries/Session/Session.php
  160. +34 −7 system/libraries/Session/drivers/Session_cookie.php
  161. +3 −2 system/libraries/Session/drivers/Session_native.php
  162. +2 −1 system/libraries/Table.php
  163. +39 −5 system/libraries/Trackback.php
  164. +2 −1 system/libraries/Typography.php
  165. +53 −32 system/libraries/Unit_test.php
  166. +208 −35 system/libraries/Upload.php
  167. +2 −1 system/libraries/User_agent.php
  168. +331 −41 system/libraries/Xmlrpc.php
  169. +2 −1 system/libraries/Xmlrpcs.php
  170. +2 −1 system/libraries/Zip.php
  171. +70 −27 system/libraries/javascript/Jquery.php
  172. +0 −1 tests/codeigniter/core/Loader_test.php
  173. +1 −1 tests/codeigniter/database/DB_driver_test.php
  174. +4 −4 tests/codeigniter/helpers/directory_helper_test.php
  175. +15 −0 tests/codeigniter/helpers/form_helper_test.php
  176. +8 −11 tests/mocks/autoloader.php
  177. +1 −0 tests/mocks/database/db/driver.php
  178. +3 −3 tests/mocks/database/schema/skeleton.php
  179. +89 −48 user_guide_src/source/changelog.rst
  180. +1 −1 user_guide_src/source/contributing/index.rst
  181. +41 −20 user_guide_src/source/database/forge.rst
  182. +43 −35 user_guide_src/source/database/utilities.rst
  183. +10 −11 user_guide_src/source/general/alternative_php.rst
  184. +50 −11 user_guide_src/source/general/ancillary_classes.rst
  185. +9 −9 user_guide_src/source/general/autoloader.rst
  186. +16 −14 user_guide_src/source/general/caching.rst
  187. +7 −7 user_guide_src/source/general/cli.rst
  188. +141 −36 user_guide_src/source/general/common_functions.rst
  189. +112 −104 user_guide_src/source/general/controllers.rst
  190. +20 −20 user_guide_src/source/general/core_classes.rst
  191. +3 −2 user_guide_src/source/general/creating_drivers.rst
  192. +60 −33 user_guide_src/source/general/creating_libraries.rst
  193. +1 −1 user_guide_src/source/general/credits.rst
  194. +8 −8 user_guide_src/source/general/drivers.rst
  195. +3 −3 user_guide_src/source/general/environments.rst
  196. +44 −22 user_guide_src/source/general/errors.rst
  197. +30 −28 user_guide_src/source/general/helpers.rst
  198. +37 −36 user_guide_src/source/general/hooks.rst
  199. +1 −1 user_guide_src/source/general/index.rst
  200. +12 −11 user_guide_src/source/general/libraries.rst
  201. +21 −23 user_guide_src/source/general/managing_apps.rst
  202. +48 −49 user_guide_src/source/general/models.rst
  203. +14 −14 user_guide_src/source/general/profiling.rst
  204. +10 −4 user_guide_src/source/general/requirements.rst
  205. +22 −19 user_guide_src/source/general/reserved_names.rst
  206. +36 −25 user_guide_src/source/general/routing.rst
  207. +35 −16 user_guide_src/source/general/security.rst
  208. +20 −22 user_guide_src/source/general/styleguide.rst
  209. +31 −10 user_guide_src/source/general/urls.rst
  210. +25 −28 user_guide_src/source/general/views.rst
  211. +1 −1 user_guide_src/source/general/welcome.rst
  212. +27 −39 user_guide_src/source/helpers/array_helper.rst
  213. +43 −56 user_guide_src/source/helpers/captcha_helper.rst
  214. +32 −33 user_guide_src/source/helpers/cookie_helper.rst
  215. +154 −185 user_guide_src/source/helpers/date_helper.rst
  216. +2 −3 user_guide_src/source/helpers/directory_helper.rst
  217. +19 −13 user_guide_src/source/helpers/download_helper.rst
  218. +33 −15 user_guide_src/source/helpers/email_helper.rst
  219. +128 −50 user_guide_src/source/helpers/file_helper.rst
  220. +346 −172 user_guide_src/source/helpers/form_helper.rst
  221. +168 −128 user_guide_src/source/helpers/html_helper.rst
  222. +48 −34 user_guide_src/source/helpers/inflector_helper.rst
  223. +14 −11 user_guide_src/source/helpers/language_helper.rst
  224. +16 −16 user_guide_src/source/helpers/number_helper.rst
  225. +17 −14 user_guide_src/source/helpers/path_helper.rst
  226. +52 −18 user_guide_src/source/helpers/security_helper.rst
  227. +37 −33 user_guide_src/source/helpers/smiley_helper.rst
  228. +82 −54 user_guide_src/source/helpers/string_helper.rst
  229. +99 −39 user_guide_src/source/helpers/text_helper.rst
  230. +34 −11 user_guide_src/source/helpers/typography_helper.rst
  231. +176 −124 user_guide_src/source/helpers/url_helper.rst
  232. +1 −3 user_guide_src/source/installation/upgrade_211.rst
  233. +1 −3 user_guide_src/source/installation/upgrade_212.rst
  234. +20 −0 user_guide_src/source/installation/upgrade_213.rst
  235. +120 −18 user_guide_src/source/installation/upgrade_300.rst
  236. +2 −1 user_guide_src/source/installation/upgrading.rst
  237. +4 −7 user_guide_src/source/libraries/form_validation.rst
  238. +61 −32 user_guide_src/source/libraries/input.rst
  239. +1 −1 user_guide_src/source/libraries/sessions.rst
  240. +1 −1 user_guide_src/source/libraries/unit_testing.rst
@@ -62,11 +62,11 @@
| URI string. The default setting of 'AUTO' works for most servers.
| If your links do not seem to work, try one of the other delicious flavors:
|
-| 'AUTO' Default - auto detects
-| 'PATH_INFO' Uses the PATH_INFO
-| 'QUERY_STRING' Uses the QUERY_STRING
-| 'REQUEST_URI' Uses the REQUEST_URI
-| 'ORIG_PATH_INFO' Uses the ORIG_PATH_INFO
+| 'AUTO' Default - auto detects
+| 'CLI' or 'argv' Uses $_SERVER['argv'] (for php-cli only)
+| 'PATH_INFO' Uses $_SERVER['PATH_INFO']
+| 'REQUEST_URI' Uses $_SERVER['REQUEST_URI']
+| 'QUERY_STRING' Uses $_SERVER['QUERY_STRING']
|
*/
$config['uri_protocol'] = 'AUTO';
@@ -40,44 +40,56 @@
'/Ä/' => 'Ae',
'/Ü/' => 'Ue',
'/Ö/' => 'Oe',
- '/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ|Α|Ά|Ả|Ạ|Ầ|Ẫ|Ẩ|Ậ|Ằ|Ắ|Ẵ|Ẳ|Ặ/' => 'A',
- '/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª|α|ά|ả|ạ|ầ|ấ|ẫ|ẩ|ậ|ằ|ắ|ẵ|ẳ|ặ/' => 'a',
+ '/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ|Α|Ά|Ả|Ạ|Ầ|Ẫ|Ẩ|Ậ|Ằ|Ắ|Ẵ|Ẳ|Ặ|А/' => 'A',
+ '/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª|α|ά|ả|ạ|ầ|ấ|ẫ|ẩ|ậ|ằ|ắ|ẵ|ẳ|ặ|а/' => 'a',
+ '/Б/' => 'B',
+ '/б/' => 'b',
'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
'/ç|ć|ĉ|ċ|č/' => 'c',
+ '/Д/' => 'D',
+ '/д/' => 'd',
'/Ð|Ď|Đ|Δ/' => 'Dj',
'/ð|ď|đ|δ/' => 'dj',
- '/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ/' => 'E',
- '/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ/' => 'e',
- '/Ĝ|Ğ|Ġ|Ģ|Γ/' => 'G',
- '/ĝ|ğ|ġ|ģ|γ/' => 'g',
+ '/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ|Е|Ё|Э/' => 'E',
+ '/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ|е|ё|э/' => 'e',
+ '/Ф/' => 'F',
+ '/ф/' => 'f',
+ '/Ĝ|Ğ|Ġ|Ģ|Γ|Г/' => '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',
- '/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự/' => 'U',
- '/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự/' => 'u',
+ '/Ķ|Κ|К/' => 'K',
+ '/ķ|κ|к/' => 'k',
+ '/Ĺ|Ļ|Ľ|Ŀ|Ł|Λ|Л/' => 'L',
+ '/ĺ|ļ|ľ|ŀ|ł|λ|л/' => 'l',
+ '/М/' => 'M',
+ '/м/' => 'm',
+ '/Ñ|Ń|Ņ|Ň|Ν|Н/' => 'N',
+ '/ñ|ń|ņ|ň|ʼn|ν|н/' => 'n',
+ '/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ|Ο|Ό|Ω|Ώ|Ỏ|Ọ|Ồ|Ố|Ỗ|Ổ|Ộ|Ờ|Ớ|Ỡ|Ở|Ợ|О/' => 'O',
+ '/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º|ο|ό|ω|ώ|ỏ|ọ|ồ|ố|ỗ|ổ|ộ|ờ|ớ|ỡ|ở|ợ|о/' => 'o',
+ '/П/' => 'P',
+ '/п/' => 'p',
+ '/Ŕ|Ŗ|Ř|Ρ|Р/' => 'R',
+ '/ŕ|ŗ|ř|ρ|р/' => 'r',
+ '/Ś|Ŝ|Ş|Ș|Š|Σ|С/' => 'S',
+ '/ś|ŝ|ş|ș|š|ſ|σ|ς|с/' => 's',
+ '/Ț|Ţ|Ť|Ŧ|τ|Т/' => 'T',
+ '/ț|ţ|ť|ŧ|т/' => 't',
+ '/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/' => 'U',
+ '/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/' => 'u',
'/Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ/' => 'Y',
'/ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ/' => 'y',
+ '/В/' => 'V',
+ '/в/' => 'v',
'/Ŵ/' => 'W',
'/ŵ/' => 'w',
- '/Ź|Ż|Ž|Ζ/' => 'Z',
- '/ź|ż|ž|ζ/' => 'z',
+ '/Ź|Ż|Ž|Ζ/' => 'Z',
+ '/ź|ż|ž|ζ/' => 'z',
'/Æ|Ǽ/' => 'AE',
'/ß/'=> 'ss',
'/IJ/' => 'IJ',
@@ -89,6 +101,22 @@
'/β/' => 'v',
'/μ/' => 'm',
'/ψ/' => 'ps',
+ '/Ж/'=>'Zh',
+ '/ж/'=>'zh',
+ '/Х/'=>'Kh',
+ '/х/'=>'kh',
+ '/Ц/'=>'Tc',
+ '/ц/'=>'tc',
+ '/Ч/'=>'Ch',
+ '/ч/'=>'ch',
+ '/Ш/'=>'Sh',
+ '/ш/'=>'sh',
+ '/Щ/'=>'Shch',
+ '/щ/'=>'shch',
+ '/Ю/'=>'Iu',
+ '/ю/'=>'iu',
+ '/Я/'=>'Ia',
+ '/я/'=>'ia'
);
/* End of file foreign_chars.php */
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
class Welcome extends CI_Controller {
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
?><!DOCTYPE html>
<html lang="en">
<head>
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
?><!DOCTYPE html>
<html lang="en">
<head>
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
?><!DOCTYPE html>
<html lang="en">
<head>
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
?>
<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
?><!DOCTYPE html>
<html lang="en">
<head>
View
@@ -7,7 +7,7 @@ Issues are a quick way to point out a bug. If you find a bug or documentation er
1. There is not already an open Issue
2. The issue has already been fixed (check the develop branch, or look for closed Issues)
-3. Is it something really obvious that you fix it yourself?
+3. Is it something really obvious that you can fix yourself?
Reporting issues is helpful but an even better approach is to send a Pull Request, which is done by "Forking" the main repository and committing to your own copy. This will require you to use the version control system called Git.
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
/**
* Benchmark Class
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
/**
* System Initialization File
@@ -255,23 +256,22 @@ function &get_instance()
* Security check
* ------------------------------------------------------
*
- * None of the functions in the app controller or the
+ * None of the methods in the app controller or the
* loader class can be called via the URI, nor can
- * controller functions that begin with an underscore
+ * controller functions that begin with an underscore.
*/
$class = $RTR->fetch_class();
$method = $RTR->fetch_method();
- if ( ! class_exists($class)
- OR strpos($method, '_') === 0
- OR in_array(strtolower($method), array_map('strtolower', get_class_methods('CI_Controller')))
- )
+ if ( ! class_exists($class) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
{
if ( ! empty($RTR->routes['404_override']))
{
- $x = explode('/', $RTR->routes['404_override'], 2);
- $class = $x[0];
- $method = isset($x[1]) ? $x[1] : 'index';
+ if (sscanf($RTR->routes['404_override'], '%[^/]/%s', $class, $method) !== 2)
+ {
+ $method = 'index';
+ }
+
if ( ! class_exists($class))
{
if ( ! file_exists(APPPATH.'controllers/'.$class.'.php'))
@@ -288,6 +288,42 @@ function &get_instance()
}
}
+ if (method_exists($class, '_remap'))
+ {
+ $params = array($method, array_slice($URI->rsegments, 2));
+ $method = '_remap';
+ }
+ else
+ {
+ // WARNING: It appears that there are issues with is_callable() even in PHP 5.2!
+ // Furthermore, there are bug reports and feature/change requests related to it
+ // that make it unreliable to use in this context. Please, DO NOT change this
+ // work-around until a better alternative is available.
+ if ( ! in_array(strtolower($method), array_map('strtolower', get_class_methods($class)), TRUE))
+ {
+ if (empty($RTR->routes['404_override']))
+ {
+ show_404($class.'/'.$method);
+ }
+ elseif (sscanf($RTR->routes['404_override'], '%[^/]/%s', $class, $method) !== 2)
+ {
+ $method = 'index';
+ }
+
+ if ( ! class_exists($class))
+ {
+ if ( ! file_exists(APPPATH.'controllers/'.$class.'.php'))
+ {
+ show_404($class.'/'.$method);
+ }
+
+ include_once(APPPATH.'controllers/'.$class.'.php');
+ }
+ }
+
+ $params = array_slice($URI->rsegments, 2);
+ }
+
/*
* ------------------------------------------------------
* Is there a "pre_controller" hook?
@@ -317,45 +353,7 @@ function &get_instance()
* Call the requested method
* ------------------------------------------------------
*/
- // Is there a "remap" function? If so, we call it instead
- if (method_exists($CI, '_remap'))
- {
- $CI->_remap($method, array_slice($URI->rsegments, 2));
- }
- else
- {
- // is_callable() returns TRUE on some versions of PHP 5 for private and protected
- // methods, so we'll use this workaround for consistent behavior
- if ( ! in_array(strtolower($method), array_map('strtolower', get_class_methods($CI))))
- {
- // Check and see if we are using a 404 override and use it.
- if ( ! empty($RTR->routes['404_override']))
- {
- $x = explode('/', $RTR->routes['404_override'], 2);
- $class = $x[0];
- $method = isset($x[1]) ? $x[1] : 'index';
- if ( ! class_exists($class))
- {
- if ( ! file_exists(APPPATH.'controllers/'.$class.'.php'))
- {
- show_404($class.'/'.$method);
- }
-
- include_once(APPPATH.'controllers/'.$class.'.php');
- unset($CI);
- $CI = new $class();
- }
- }
- else
- {
- show_404($class.'/'.$method);
- }
- }
-
- // Call the requested method.
- // Any URI segments present (besides the class/function) will be passed to the method for convenience
- call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, 2));
- }
+ call_user_func_array(array(&$CI, $method), $params);
// Mark a benchmark end point
$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_end');
Oops, something went wrong.

0 comments on commit 3978fc3

Please sign in to comment.