summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-11-06Merge pull request #1974 from squaresurf/unit_testing_doc_typoAndrey Andreev1-1/+1
Fixed typo in unit testing documentation.
2012-11-06Added possibility to pass custom database objects to DB Forge and DB UtilitiesAndrey Andreev14-121/+165
Also, their property is no longer public and the utility class no longer extends CI_DB_forge.
2012-11-05Fixed typo in unit testing documentation.Daniel Paul Searles1-1/+1
There was a reference to a non-existent Unit_test::set_items method when it should be Unit_test::set_test_items.
2012-11-05Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developDaniel Paul Searles49-1498/+3681
2012-11-05Re-fix multiple-column non-primary key indexesAndrey Andreev1-1/+1
2012-11-05Fix Forge add_column() and modify_column()Andrey Andreev1-2/+2
2012-11-05Refactored DB ForgeAndrey Andreev31-1387/+3487
- PDO subdrivers are isolated from each other now. - Added compatibility for pretty much all of the features, for every DB platform. - Unified the way that stuff works in general. - Fixes issue #1005.
2012-11-05Fix DB drivers version() implementations that don't execute a queryAndrey Andreev7-14/+66
Fails if called prior to the DB connection initialization.
2012-11-05Revert usage of is_callable() in system/core/CodeIgniter.phpAndrey Andreev2-72/+86
Seems to be causing issues (see #1970). Also updated the Controller docs, mainly to include an important note related to #1967.
2012-11-05Merge pull request #1730 from damao/developAlex Bilbie1-1/+1
Fix / Disallowed Key Characters.
2012-11-05Merge pull request #1948 from GDmac/developAlex Bilbie1-1/+1
Fix #1946 dbforge add_key
2012-11-04Fix #708Andrey Andreev1-4/+8
2012-11-04Fix #98Andrey Andreev1-1/+1
2012-11-04Merge pull request #1962 from ↵Andrey Andreev1-25/+6
squaresurf/d2ae1d1d7fdc4b8a21369a25487c2c42e5a496bf Refactored Unit_test in order to remove redundant code.
2012-11-03Fix #1957Andrey Andreev2-6/+8
2012-11-03Merge pull request #1964 from Razican/log_fixAndrey Andreev1-1/+1
Fixed typo in logs
2012-11-03Revert 679525d0237ac2e0a94d7b05377eb31eb3398f19Andrey Andreev5-11/+22
It appears to break get_instance()->*_package_path*() usage which is very common. Need to figure out how to resolve this.
2012-11-03Fixed typo in logs.Razican1-1/+1
2012-11-03Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developDaniel Paul Searles1-1/+1
2012-11-03Refactored Unit_test in order to remove redundant code.Daniel Paul Searles1-25/+6
The Unit_test::run method was adding another dimension to the Unit_test::$results array. For example: Array ( [0] => Array ( [0] => Array ( [test_name] => first_test [test_datatype] => integer [res_datatype] => integer [result] => passed [file] => ######################################## [line] => 60 [notes] => Im expecting this test to pass! ) ) [1] => Array ( [0] => Array ( [test_name] => second_test [test_datatype] => integer [res_datatype] => boolean [result] => failed [file] => ####################################### [line] => 65 [notes] => Im expecting this to fail. ) ) ) The above unneeded dimension created a need to loop through an array in the Unit_test::result method if the method was looping through all results. Signed-off-by: Daniel Paul Searles <daniel.paul.searles@gmail.com>
2012-11-03[ci skip] Correct a changelog entryAndrey Andreev1-1/+1
2012-11-03Fix the bloody testsAndrey Andreev2-35/+39
2012-11-02An attempt to fix Loader testsAndrey Andreev1-38/+35
2012-11-02Removed CI_Loader::initialize() and moved its logic to the constructor.Andrey Andreev3-23/+7
That method used to be called by the CI_Controller constructor and was required because of the possibility to instantiate the Controller class twice due to 404_override, and so some properties needed to be reset. Following the last commit - this is no longer the case.
2012-11-02Bootstrap improvementsAndrey Andreev2-39/+34
- Don't instantiate the CI singleton twice. - General clean-up. - Fix issue #953.
2012-11-02Some micro-optimizationsAndrey Andreev5-25/+12
2012-11-02Fix a directory/404_override bug and some routing-related optimizationsAndrey Andreev3-61/+32
2012-11-02Fix #1960Andrey Andreev1-1/+1
2012-11-02Fix #1956Andrey Andreev1-1/+1
2012-11-02Router-related optimizationsAndrey Andreev2-16/+4
An improved version of changes suggesed in PR #1352, and more specifically: https://github.com/sourcejedi/CodeIgniter/commit/8f7d2dfe42bd8543981c0f295e391e433d82fd42 https://github.com/sourcejedi/CodeIgniter/commit/d2de251c092d9d822fc4898e3681b64e9c74dd2a (thanks again @sourcejedi)
2012-11-02[ci skip] DocBlocks for DB drivers' driver classesAndrey Andreev26-411/+801
Partially fixes issue #1295.
2012-11-02[ci skip] DocBlocks for DB drivers' result classesAndrey Andreev12-43/+64
Partially fixes issue #1295.
2012-11-02[ci skip] DocBlocks for DB drivers' utility classesAndrey Andreev22-40/+205
Partially fixes issue #1295.
2012-11-02DocBlocks for base DB classesAndrey Andreev7-197/+864
Partially fixes issue #1295.
2012-11-01[ci skip] DocBlocks for Upload and Xmlrpc librariesAndrey Andreev2-71/+532
Partially fixes issue #1295
2012-11-01[ci skip] DocBlocks for Pagination, Session, Trackback, Jquery librariesAndrey Andreev4-66/+393
Partially fixes issue #1295
2012-11-01[ci skip] DocBlocks for Email, Ftp, Unit_test and Javascript librariesAndrey Andreev4-61/+437
Partially fixes issue #1295
2012-11-01Fix issue #122Andrey Andreev2-1/+9
2012-11-01Allow use of dashes in controller/method URI segmentsAndrey Andreev4-10/+39
Supersedes PR #642
2012-11-01[ci skip] Alter form validation examples including the *matches* ruleAndrey Andreev1-4/+4
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.