summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-01-25Updated all cases of exit() to return a valid codeDaniel Hunsaker11-19/+37
Specific codes are as follows, but can easily be changed if a different order/breakdown makes more sense: - 0: Success; everything executed as planned - 1: Configuration Error; something is wrong with/in the configuration file(s) - 2: Class Not Found; what it says - 3: Driver Method Unsupported; the method you're trying to use on a Driver doesn't exist - 4: File Not Found; 404 error - 5: Database Error; something is broken in the database somewhere - 6: Invalid Input; the user attempted to submit a request with invlaid characters in 1+ key names 7 through 26 are reserved for future use - 27: Generic Error; generated by show_error() when the status code is >= 100 28 through 127 are errors generated by user applications, normally by using show_error() with a status code below 100 128 through 254 should not be used by applications, as they are reserved by system-level functions - 255: PHP Fatal Error; automatically generated by PHP for fatal errors, and therefore not allowed for our use Status codes below 100 are shifted up by 28 to place them in the user error range. It may make more sense to have these codes left alone and instead shift the CI errors into the 101 through 127 space, but that's not what I opted for here. It would probably also be a good idea to replace the hard-coded numbers with constants or some such, but I was in a bit of a hurry when I made these changes, so I didn't look around for the best place to do this. With proper guidance, I could easily amend this commit with another that uses such constant values. Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2013-01-24Move db_select() call from CI_DB_driver::initialize() to db_connect()Andrey Andreev6-17/+30
so that it's only called by drivers that need it ('mysql', 'mssql'). As proposed in issue #2187.
2013-01-24Merge pull request #2186 from 12k/patch-1Andrey Andreev1-2/+2
Removed slash from URI helper doc
2013-01-23Removed slash from URI helper docMelvin Lammerts1-2/+2
In my current projects I don't see '/controller/method' but 'controller/method' when calling uri_string().
2013-01-23Merge pull request #2185 from OsamaAbbas/patch-1Andrey Andreev1-2/+2
Update application/config/config.php
2013-01-23Update application/config/config.phpOsamaAbbas1-2/+2
2013-01-22Merge pull request #2164 from cryode/bug/auto_linkAndrey Andreev1-27/+18
Fix and optimize auto_link() URL helper function.
2013-01-21Adjust regex.Eric Roberts1-1/+1
2013-01-21Partially implement PR #2155Andrey Andreev2-0/+3
2013-01-21[ci skip] Manually apply #2162, #2163Andrey Andreev2-2/+3
2013-01-21[ci skip] Add text/plain as a valid MIME for js,css,*html,xmlAndrey Andreev1-6/+6
2013-01-21Merge pull request #2171 from purwandi/minify-table-blockAndrey Andreev1-4/+4
Support minify table block in output
2013-01-19Support minify table blockPurwandi1-4/+4
2013-01-19Remove whitespace from empty lines.Eric Roberts1-5/+5
Signed-off-by: Eric Roberts <eric@cryode.com>
2013-01-18Merge pull request #2151 from cryode/feature/output-cache-improvementsAndrey Andreev1-4/+18
Add headers to Output class cache files.
2013-01-18Return spacing on var definitions.Eric Roberts1-6/+6
Signed-off-by: Eric Roberts <eric@cryode.com>
2013-01-18Fix and optimize auto_link() URL helper function.Eric Roberts1-31/+22
Signed-off-by: Eric Roberts <eric@cryode.com>
2013-01-17Fix issues #2160, #2161Andrey Andreev1-11/+6
2013-01-17Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Eric Roberts13-50/+56
feature/output-cache-improvements
2013-01-15Merge pull request #2152 from vlakoff/developAndrey Andreev12-27/+27
Replace is_null() with === / !== NULL
2013-01-15A few adjustments to previous commitvlakoff2-2/+2
2013-01-15[ci skip] Fix issue #2157 - docs on the email libraryAndrey Andreev1-23/+29
2013-01-14Replace is_null() with === / !== NULLvlakoff12-28/+28
Exact same behavior, but faster. I also think it's more readable.
2013-01-12Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Eric Roberts4-5/+10
feature/output-cache-improvements
2013-01-12Improve output cache.Eric Roberts1-10/+24
2013-01-12Implement autoload model aliasing (#2117)Andrey Andreev4-5/+10
2013-01-11Merge pull request #2145 from vlakoff/developAndrey Andreev1-2/+9
URI->_remove_url_suffix() : suffix has to be at the end of uri_string
2013-01-11URI->_remove_url_suffix() : more efficient codevlakoff1-3/+3
related to #2135
2013-01-10A tiny improvementAndrey Andreev1-3/+2
2013-01-10URI->_remove_url_suffix() : suffix has to be at the end of uri_stringvlakoff1-2/+9
related to #2135
2013-01-10Unify escape_str() array input and LIKE logicAndrey Andreev13-345/+87
Added protected method _escape_str() to deal with quote escaping.
2013-01-10Fix SQLSRV escape_str()Andrey Andreev2-1/+24
2013-01-10Merge pull request #2127 from TheDigitalOrchard/uri-lib-optimizationsAndrey Andreev1-7/+7
minor tweaks and optimizations to URI library
2013-01-10Apply improvement proposed in #2142Andrey Andreev2-2/+2
2013-01-10Merge pull request #2141 from vlakoff/developAndrey Andreev7-51/+51
Syntax fixes in documentation source
2013-01-10Merge pull request #2139 from timw4mail/developAndrey Andreev1-1/+1
Fix interbase limit issue for subqueries
2013-01-10Merge pull request #2136 from n1c/patch-1Andrey Andreev1-1/+1
[ci skip] Small typo in autoload config.
2013-01-10Merge pull request #2133 from TheDigitalOrchard/image_lib-imagejpegAndrey Andreev1-1/+1
fix imagejpeg() parameter, should be NULL instead of empty string
2013-01-09Syntax fixes in documentation sourcevlakoff7-51/+51
2013-01-09Fix interbase limit issue for subqueriesTimothy Warren1-1/+1
2013-01-09Small typo in autoload config.Nic1-1/+1
Fixed "Packges" to read "Packages".
2013-01-09fix imagejpeg() parameter, should be NULL instead of empty stringTed Wood1-1/+1
2013-01-07minor tweaks and optimizations: minimize function calls in ↵Ted Wood1-7/+7
_fetch_uri_string(); use constant PHP_SAPI instead of function php_sapi_name()
2013-01-06Merge pull request #2120 from mikezilla/developAndrey Andreev1-1/+1
Fix MSIE conditionals regex in minify output
2013-01-06Merge pull request #2121 from TheDigitalOrchard/developAndrey Andreev2-11/+16
utilize static function variables in Common::log_message() to "cache" lo...
2013-01-06Slight performance improvement by moving some class property initialization ↵Ted Wood1-8/+4
to the class property declarations rather than setting them in the constructor. Subclasses can always override in their own constructor if they wish to. Is there a reason why it was done the way it was done? A policy that I am not aware of?
2013-01-06utilize static function variables in Common::log_message() to "cache" log ↵Ted Wood1-3/+12
threshold and Log library instance to reduce function calls
2013-01-05Fix MSIE conditionals regex in minify outputMichael Dodge1-1/+1
Allows IE conditionals like the following to remain unmodified. ```html <!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]--> ``` Credit to joebert regex from http://www.sitepoint.com/forums/showthread.php?696559-Regex-pattern-to-strip-HTML-comments-but-leave-conditonals&s=3eef4ceb0a59b2fdb946fa56220fb6fd&p=4678083&viewfull=1#post4678083
2013-01-05Revert "Fix MSIE conditionals regex in minify output func"Michael Dodge1-921/+921
This reverts commit 8e12c787042396e172a7448c65bd16c3015ffb0f.
2013-01-05Fix MSIE conditionals regex in minify output funcMichael Dodge1-921/+921
Allows IE conditionals like the following to remain unmodified. <!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]--> Credit to joebert regex from http://www.sitepoint.com/forums/showthread.php?696559-Regex-pattern-to-strip-HTML-comments-but-leave-conditonals&s=3eef4ceb0a59b2fdb946fa56220fb6fd&p=4678083&viewfull=1#post4678083