Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge master #1

Open
wants to merge 2,656 commits into
base: master
Choose a base branch
from
Open

merge master #1

wants to merge 2,656 commits into from

Conversation

some81
Copy link

@some81 some81 commented Mar 26, 2015

No description provided.

Phil Sturgeon and others added 30 commits March 15, 2011 17:03
jondavidjohn and others added 30 commits August 10, 2011 10:22
…s and functions that fail the security check in CodeIgniter.php
…r can 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.
404_override route now works for missing controllers in subdirectories.
Adding a note to the changelog about 404_override.
…y). Corrected formatting/indenting in CUBRID Driver classes. Added myself as the driver author. Applied the MySQL fix, previously accepted in pull request #29, to CUBRID Driver.
…lciation/config/database.php file which was incorrectly replaced in previous commit.
CUBRID Database Driver for CI.
Added some doc blocks to some CI core files
Develop - Added some docs to CI core files
Added some docs to CI core files
Added some docs to CI core files
Conflicts:
	system/fonts/texb.ttf
	user_guide/images/appflowchart.gif
Added Form_Validation Date Rule ... Form_Validation set_message() consistency
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants