summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-11-01Manually apply PR #1594 (fixing phpdoc page-level generation/warnings)Andrey Andreev156-156/+312
Also partially fixes issue #1295, fixes inconsistencies in some page-level docblocks and adds include checks in language files.
2012-11-01Remove is_numeric() checks from Cart library (superseded by casts to float)Andrey Andreev1-16/+1
2012-11-01Fix an erroneous variable nameAndrey Andreev1-1/+1
2012-11-01Fix issue #1953 (form values being escaped twice)Andrey Andreev6-76/+88
Re-instaing an improved form_prep() function, reverting most of the changes from 74ffd17ab06327ca62ddfe28a186cae7ba6bd459.
2012-11-01[ci skip] Add changelog entry for PR #1951Andrey Andreev1-2/+2
2012-11-01Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev1-26/+54
2012-11-01Merge pull request #1951 from dronord/developAndrey Andreev1-26/+54
add russian in foreign_chars.php
2012-11-01russian second letter in lowercase, foreign_chars.phpsa1-8/+8
2012-11-01Remove var_dump() missed in a previous commitAndrey Andreev1-1/+0
2012-11-01Session cookie driver changesAndrey Andreev2-6/+32
- Changed docs CREATE TABLE ci_sessions example to have the PRIMARY KEY of session_id, ip_address and user_agent combined. - Changed DB updates to add WHERE clauses for the ip_address and/or user_agent strings if sess_match_ip and/or sess_match_useragent are set to TRUE.
2012-11-01Fix an update_string() bugAndrey Andreev2-28/+4
2012-10-31Changed URI auto-detection to try PATH_INFO firstAndrey Andreev3-10/+8
(thanks to @sourcejedi, PR #1326) Up until PHP 5.2.4 (which is our new lowest requirement), there was a bug related to PATH_INFO which made REQUEST_URI a more reliable choice. This is now no longer the case, see https://bugs.php.net/bug.php?id=31892 for more details. Also removed ORIG_PATH_INFO from the suggested alternatives for uri_protocol in application/config/config.php as it will not exist in most of PHP's recent versions and is pointless when you can use PATH_INFO anyway.
2012-10-31add russian in foreign_chars.phpAndrey1-26/+54
2012-10-31Fix issue in resetting QUERY_STRING, GET vars introduced in ↵Andrey Andreev1-26/+2
f2b19fee7876708c7a7bb5cba6b7df682a9d2a53
2012-10-31Fix issues #388 & #705Andrey Andreev2-5/+7
(thanks to @sourcejedi, PR #1326 for pointing inconsistencies with RFC2616
2012-10-31Merge pull request #1636 from jdfm/developAndrey Andreev3-3/+53
Processed routes
2012-10-31Fix an erroneous variable nameAndrey Andreev1-1/+1
2012-10-31Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJonatas Miguel52-1104/+1399
2012-10-31removed conflict markersJonatas Miguel1-24/+0
2012-10-31Multiple improvements to the URI classAndrey Andreev3-34/+85
(thanks to @sourcejedi, PR #1326 for most of the ideas) - Renamed _detect_uri() and _parse_cli_args() to _parse_request_uri() and _parse_argv() respectively. - Added _parse_query_string() which allows us to detect the URI path from QUERY_STRING much like it is done in _parse_request_uri(). (the above changes also allow for a simpler logic in the case where the *uri_protocol* setting is not set to 'AUTO') - Updated application/config/config.php with a better list of the *uri_protocol* options. - Added _reset_query_string() to aid in re-processing from the QUERY_STRING (utilized in _parse_request_uri() and _parse_query_string()).
2012-10-31CI_URI::_detect_uri() to accept absolute URIsAndrey Andreev2-21/+23
(thanks to @sourcejedi, PR #1326) For HTTP/1.1 compliance, RFC2616 specifies that both relative and absolute URI formats must be accepted: - http://localhost/path/ (absolute) - /path/ (relative)
2012-10-30Merge pull request #1945 from GDmac/developAndrey Andreev2-3/+7
Fix #1938
2012-10-30Description for Fix #1938 added to changelog (sync)GDmac0-0/+0
Conflicts: user_guide_src/source/changelog.rst Signed-off-by: GDmac <grdalenoort@gmail.com>
2012-10-30Description for Fix #1938 added to changelogGDmac1-0/+1
Signed-off-by: GDmac <grdalenoort@gmail.com>
2012-10-30Fix issue #658 (:any wildcard matching slashes)Andrey Andreev4-15/+58
2012-10-30[ci skip] Fix a note in the QB documentationAndrey Andreev1-2/+2
2012-10-30[ci skip] Alter a changelog entry for 2.1.3Andrey Andreev1-1/+1
2012-10-30Fix issue #658 (:any wildcard matching slashes)Andrey Andreev4-15/+58
2012-10-30[ci skip] Fix a note in the QB documentationAndrey Andreev1-2/+2
2012-10-30[ci skip] Alter a changelog entry for 2.1.3Andrey Andreev1-1/+1
2012-10-30Fix #1938GDmac1-3/+6
Where the email library removed multiple spaces inside a plain text message. Signed-off-by: GDmac <grdalenoort@gmail.com>
2012-10-29[ci skip] Clarify explanation of the 404_override setting in ↵Andrey Andreev1-2/+2
application/config/routes.php
2012-10-28[ci skip] URI Library DocBlock improvementsAndrey Andreev1-84/+108
2012-10-28[ci skip] DocBlock improvements for Security libraryAndrey Andreev1-77/+100
2012-10-28Fix #1937Andrey Andreev1-1/+1
2012-10-27Merge pull request #1935 from vkeranov/developAndrey Andreev11-22/+14
Remove some extra new lines
2012-10-27Remove extra spaces...vkeranov1-3/+3
2012-10-27[ci skip] Router class DocBlock improvementsAndrey Andreev2-103/+120
2012-10-27Remove extra new linesvkeranov1-7/+6
2012-10-27Remove extra new linesvkeranov1-2/+1
2012-10-27Style guide...vkeranov1-1/+1
2012-10-27Update system/core/URI.phpvkeranov1-2/+1
2012-10-27Remove extra new linesvkeranov1-1/+0
2012-10-27Remove extra new linesvkeranov1-2/+1
2012-10-27Remove extra new linesvkeranov1-1/+0
2012-10-27Remove extra new linesvkeranov1-1/+0
2012-10-27Fix Loader testsAndrey Andreev1-2/+2
2012-10-27Remove extra space...vkeranov1-1/+1
2012-10-27Remove extra new linesvkeranov1-1/+0
2012-10-27Make CI_Loader::config() a proper alias for CI_Config::load() and improve ↵Andrey Andreev2-136/+155
the Loader class DocBlocks