summaryrefslogtreecommitdiffstats
path: root/system/core
AgeCommit message (Collapse)AuthorFilesLines
2011-08-13Fixed conflicts.Phil Sturgeon2-2/+2
2011-08-13Fixed conflict in changelog.Phil Sturgeon1-0/+15
2011-08-13Get php_sapi_name() == 'cli' involved in the 'is this the command line?' ↵Phil Sturgeon2-2/+2
decision.
2011-08-13Merged my GitHub mirror.Phil Sturgeon4-13/+45
2011-08-13Merge branch 'develop' of ellislab.beanstalkapp.com:/codeigniter into developPhil Sturgeon1-12/+46
2011-08-13If a config class was loaded first then a library with the same name is ↵Phil Sturgeon1-4/+4
loaded, the config would be ignored.
2011-08-12Merging - fingers crossedPascal Kriete1-0/+15
Conflicts: system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php system/libraries/Email.php user_guide/changelog.html user_guide/database/configuration.html user_guide/helpers/url_helper.html user_guide/libraries/cart.html user_guide/libraries/form_validation.html
2011-08-10Reset loaded files arrays in the Loader so the 404_override controller can ↵Shane Pearson2-11/+12
access autoloaded libraries. If a controller exists but a method is not found the current $CI instance is unset and a new one is created for the 404 override controller. Any autoloaded libraries will not be available to the 404 override controller because the Loader sees them as already have been loaded. To fix this we need to reset the loader. I implemented it via an initialize function that resets the loaded files arrays and then calls the autoloader. This also simplifies things in CI_Controller because it only has to call one loader function instead.
2011-08-10404_override route now works for missing controllers in subdirectories and ↵Shane Pearson2-2/+33
functions that fail the security check in CodeIgniter.php
2011-07-23Added ->load->get_var() to check against ->load->_ci_cached_vars[].Phil Sturgeon1-0/+15
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones1-13/+48
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones16-194/+194
broke the Typography class's string replacements, for instance
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones16-194/+194
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones16-194/+194
broke the Typography class's string replacements, for instance
2011-06-15Merged base_url changes.philsturgeon1-12/+46
2011-05-08Wrapped all common functions to check if it already exists. This allows ↵Dan Horrigan1-13/+48
anyone to override a lot more of the core by simply defining these function prior to loading them.
2011-04-27Reverting last change. Don't know what I was thinking. :(Eric Barnes1-1/+1
2011-04-26Automatic base_url generation was missing a ending slash.Eric Barnes1-1/+1
2011-04-25Fixed double-space typo.Razican16-194/+194
2011-04-22Fixed re-searching for config file even though one had been loaded ($found ↵katzgrau1-1/+2
was set to true, never reset). Also fixes getsparks issue.
2011-04-21Flipping around contents of a conditional in _ci_load() so the small bits ↵Greg Aker1-6/+6
are on top.
2011-04-20Automated merge with http://hg.ellislab.com/CodeIgniter-ReactorGreg Aker2-24/+58
2011-04-20Refactoring the loader to set protected class variables.Greg Aker2-24/+58
Moved _ci_autoload(), which is used in CI_Controller to be a public method. Also added CI_Loader::set_base_classes() to be called in the controller so we're not setting protected vars in another class. Also refactored in the form_helper so it's not trying to access protected vars in CI_Loader. Added the is_loaded() method to the loader to take care of the checks that were being done there.
2011-04-20Change in core/Security.php to match coding standards.Greg Aker1-1/+2
2011-04-20Altering the loader to be able to load views from packages when adding the ↵Greg Aker2-53/+59
package path with add_package_path().
2011-04-19Removing internal references to the EXT constant. Additionally, marked the ↵Greg Aker9-71/+71
constant as deprecated. Use ".php" instead. Also adding upgrade notes from 2.0.2 to 2.0.3.
2011-04-18Changed server check to ensure SCRIPT_NAME is defined. Fixes #57Eric Barnes1-5/+5
2011-04-12reapply changes made to core filesFlorian Pritz1-2/+2
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2011-04-11Fix: codeigniter-reactor/199 cookie name was overwritten with token namepatwork1-2/+4
2011-04-11Fix: codeigniter-reactor/32 unicorns are no longer mutepatwork1-4/+4
2011-04-10update to CI 2.0.2Florian Pritz12-107/+1127
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2011-04-09Fix: codeigniter-reactor/199 CSRF config in Security class is no longer ignoredpatwork1-1/+10
2011-04-08Fix: #192 CI version constant incorrect in core/CodeIgniterGreg Aker1-1/+1
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
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-06-30 13:20:27 +0200