summaryrefslogtreecommitdiffstats
path: root/system/core
AgeCommit message (Collapse)AuthorFilesLines
2011-08-21Merge commit '1224f191d48d6dce920138a82e142134cc0b5231' into workingFlorian Pritz1-1/+1
This creates a merge base for later merges. Conflicts: application/.htaccess application/cache/.htaccess application/cache/index.html application/config/index.html application/controllers/index.html application/core/index.html application/errors/error_404.php application/errors/error_db.php application/errors/error_general.php application/errors/error_php.php application/errors/index.html application/helpers/index.html application/hooks/index.html application/index.html application/language/english/index.html application/libraries/index.html application/logs/index.html application/models/index.html application/third_party/index.html application/views/index.html index.php license.txt system/.htaccess system/core/Benchmark.php system/core/CodeIgniter.php system/core/Common.php system/core/Config.php system/core/Controller.php system/core/Exceptions.php system/core/Hooks.php system/core/Input.php system/core/Lang.php system/core/Loader.php system/core/Model.php system/core/Output.php system/core/Router.php system/core/Security.php system/core/URI.php system/core/Utf8.php system/core/index.html system/database/DB.php system/database/DB_active_rec.php system/database/DB_cache.php system/database/DB_driver.php system/database/DB_forge.php system/database/DB_result.php system/database/DB_utility.php system/database/drivers/index.html system/database/drivers/mssql/index.html system/database/drivers/mssql/mssql_driver.php system/database/drivers/mssql/mssql_forge.php system/database/drivers/mssql/mssql_result.php system/database/drivers/mssql/mssql_utility.php system/database/drivers/mysql/index.html system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysql/mysql_forge.php system/database/drivers/mysql/mysql_result.php system/database/drivers/mysql/mysql_utility.php system/database/drivers/mysqli/index.html system/database/drivers/mysqli/mysqli_driver.php system/database/drivers/mysqli/mysqli_forge.php system/database/drivers/mysqli/mysqli_result.php system/database/drivers/mysqli/mysqli_utility.php system/database/drivers/oci8/index.html system/database/drivers/oci8/oci8_driver.php system/database/drivers/oci8/oci8_forge.php system/database/drivers/oci8/oci8_result.php system/database/drivers/oci8/oci8_utility.php system/database/drivers/odbc/index.html system/database/drivers/odbc/odbc_driver.php system/database/drivers/odbc/odbc_forge.php system/database/drivers/odbc/odbc_result.php system/database/drivers/odbc/odbc_utility.php system/database/drivers/postgre/index.html system/database/drivers/postgre/postgre_driver.php system/database/drivers/postgre/postgre_forge.php system/database/drivers/postgre/postgre_result.php system/database/drivers/postgre/postgre_utility.php system/database/drivers/sqlite/index.html system/database/drivers/sqlite/sqlite_driver.php system/database/drivers/sqlite/sqlite_forge.php system/database/drivers/sqlite/sqlite_result.php system/database/drivers/sqlite/sqlite_utility.php system/database/index.html system/fonts/index.html system/fonts/texb.ttf system/helpers/array_helper.php system/helpers/captcha_helper.php system/helpers/cookie_helper.php system/helpers/date_helper.php system/helpers/directory_helper.php system/helpers/download_helper.php system/helpers/email_helper.php system/helpers/file_helper.php system/helpers/form_helper.php system/helpers/html_helper.php system/helpers/index.html system/helpers/inflector_helper.php system/helpers/language_helper.php system/helpers/number_helper.php system/helpers/path_helper.php system/helpers/security_helper.php system/helpers/smiley_helper.php system/helpers/string_helper.php system/helpers/text_helper.php system/helpers/typography_helper.php system/helpers/url_helper.php system/helpers/xml_helper.php system/index.html system/language/english/calendar_lang.php system/language/english/date_lang.php system/language/english/db_lang.php system/language/english/email_lang.php system/language/english/form_validation_lang.php system/language/english/ftp_lang.php system/language/english/imglib_lang.php system/language/english/index.html system/language/english/number_lang.php system/language/english/profiler_lang.php system/language/english/unit_test_lang.php system/language/english/upload_lang.php system/language/index.html system/libraries/Cache/Cache.php system/libraries/Cache/drivers/Cache_apc.php system/libraries/Cache/drivers/Cache_dummy.php system/libraries/Cache/drivers/Cache_file.php system/libraries/Cache/drivers/Cache_memcached.php system/libraries/Calendar.php system/libraries/Cart.php system/libraries/Driver.php system/libraries/Email.php system/libraries/Encrypt.php system/libraries/Form_validation.php system/libraries/Ftp.php system/libraries/Image_lib.php system/libraries/Javascript.php system/libraries/Log.php system/libraries/Pagination.php system/libraries/Parser.php system/libraries/Profiler.php system/libraries/Session.php system/libraries/Sha1.php system/libraries/Table.php system/libraries/Trackback.php system/libraries/Typography.php system/libraries/Unit_test.php system/libraries/Upload.php system/libraries/User_agent.php system/libraries/Xmlrpc.php system/libraries/Xmlrpcs.php system/libraries/Zip.php system/libraries/index.html system/libraries/javascript/Jquery.php Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-04-12reapply changes made to core filesFlorian Pritz1-2/+2
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2011-04-10update to CI 2.0.2Florian Pritz12-107/+1127
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2011-04-07Made in Output protected again, it was only ever made public by Eric to fix ↵Phil Sturgeon1-1/+1
an issue with the Dwoo MY_Parser, which is no reason to change core files. That Parser doesn't really even need the acess.
2011-04-06Made Environment Support optional. Comment out or delete the constant to ↵Phil Sturgeon6-48/+882
stop environment checks.
2011-04-06Made Environment Support optional. Comment out or delete the constant to ↵Phil Sturgeon7-32/+39
stop environment checks.
2011-04-05Tightening up control character handling in urlsPascal Kriete1-23/+34
2011-04-05Moving security to core.Pascal Kriete4-10/+835
2011-04-05tweaking remove_invisible_characters to make urlencoded character stripping ↵Pascal Kriete1-15/+13
optional
2011-04-03Fixed loading an array of libraries.Phil Sturgeon1-1/+1
2011-04-01Merged changes.Phil Sturgeon1-13/+3
2011-03-22If you do is_really_writable() on a file that does not exist on a Windows ↵Eric Barnes1-1/+1
server or on a Unix box with safe_mode enabled, it will create the file and leave it there. Fixes #80
2011-03-22Added error logging to language. Fixes #32Eric Barnes1-0/+7
2011-03-22Fixed logic and removed the error supressingEric Barnes2-7/+7
2011-03-18Changed scope on parse_exec_vars. Fixes #145Eric Barnes1-7/+6
2011-03-18Fixed coding to match standards from previous releasesEric Barnes2-4/+4
2011-03-17load config files from environment specific locations in core classes, ↵bubbafoley4-4/+37
helpers and libraries
2011-03-16Standardized newlines even more extensively in Input class.Phil Sturgeon1-1/+1
2011-03-15constants.php will be loaded from the environment specific config folder if ↵Phil Sturgeon1-2/+9
available.
2011-03-10Added full docs for new ENVIRONMENT constant.katzgrau1-1/+1
2011-03-09Added 2.0.1 upgrade guide and changed the constants ready.Phil Sturgeon1-1/+1
2011-03-09Merged recent Core changes and fixed conflict.Phil Sturgeon9-151/+344
2011-03-09Flipping Phil's IS_CORE to true.Pascal Kriete1-1/+1
2011-03-08Added the constant CI_CORE to help differentiate between Core: TRUE and ↵Phil Sturgeon1-0/+7
Reactor: FALSE.
2011-03-08Added the constant CI_CORE to help differentiate between Core: TRUE and ↵Phil Sturgeon1-0/+7
Reactor: FALSE.
2011-03-08Added $this->output->set_content_type() and method chaining to other methods.Phil Sturgeon1-7/+60
2011-02-18Bugfix in foreach-loop ('name' must be last, as it also is the array's ↵tobiasbg1-8/+7
name); consistent handling for 'cookie_secure' config item
2011-02-16Merged CodeIgniter Core changes and integrated rob1's secure cookie change ↵Phil Sturgeon8-142/+283
into my secure cookie change.
2011-02-16Secure cookies can now be made with the set_cookie() helper and Input Class ↵Phil Sturgeon1-3/+4
method.
2011-02-15Input post() and get() will now return a full array if the first argument is ↵Phil Sturgeon1-21/+15
not provided.
2011-02-15Automated merge with https://bitbucket.org/seandowney/codeigniter-reactorPhil Sturgeon3-7/+7
2011-02-14Whitespace cleanup in core/Pascal Kriete3-7/+7
2011-02-13Updated the post method and added the new functionality to the get method alsovascopj1-1/+17
Updated the documentation
2011-02-11Adding config option to require 'secure' setting for all cookies- requires ↵Robin Sowell1-1/+3
https.
2011-02-09cleaned up some redundant code in the Loader->library functionKellas Reeves1-13/+3
Elaborated on its functionality in the user guide.
2011-02-06A change to pass all fields back if there are no fields passed into the ↵vascopj1-0/+16
"post" method. Based on comments here http://codeigniter.uservoice.com/forums/40508-codeigniter-reactor/suggestions/1346917-allow-this-input-post-to-return-array-of-eve
2011-02-03Fixes #27. When the default controller was used, the _detect_uri() method ↵ericbarnes@ericbarnes.local1-0/+6
was returning an incorrect URI, which caused a 404 when a query string was used and no controller specified. via Dan Horrigan
2011-02-02Automated merge with http://hg.ellislab.com/CodeIgniter-ReactorPhil Sturgeon1-0/+11
2011-02-02Merged recent changes and tweaked multi-env changes.Phil Sturgeon15-117/+105
2011-02-01Better logic handling for 404 overrideEric Barnes1-0/+11
2011-02-01Automated merge with http://hg.ellislab.com/CodeIgniter-ReactorPhil Sturgeon2-3/+13
2011-02-01Some servers would trick URI into thinking it was being run in CLI mode, ↵Phil Sturgeon1-2/+2
which broke routing.
2011-01-31Added 404_override to Codeigniter file to catch the 404 if the controller is ↵Eric Barnes2-3/+13
available but no method. Fixes #19
2011-01-28fix filtered / at the end of URIsFlorian Pritz1-1/+1
file_mod->download() depends on the trailing slash to determine whether the user wants highlighting or not so we prevent it from being removed. Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2011-01-28update to CI 2.0Florian Pritz16-0/+5378
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2011-01-27Automated merge with https://bitbucket.org/ellislab/codeigniterPhil Sturgeon6-113/+172
2011-01-20Moving the file to Utf8.phpPascal Kriete1-0/+0
2011-01-20Renaming the unicode class to utf8 so we don't run the risk of violating the ↵Pascal Kriete3-15/+15
Unicode Consortium's trademark.
2011-01-19Avoid double-slashed on the base_url by only slashing index_page if it is ↵Phil Sturgeon1-1/+2
actually set.
2011-01-19Automated merge with https://bitbucket.org/dhorrigan/codeigniter-reactorPhil Sturgeon1-2/+16
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-07-31 09:47:36 +0200