summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-07-13fix issue #1605 covert page number type from float to intBo-Yi Wu1-2/+2
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2012-07-13escape_identifiers() to not escape string literals inside double quotes as wellAndrey Andreev1-1/+1
2012-07-13Fix issue #1613Andrey Andreev2-1/+7
2012-07-12Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon18-42/+38
2012-07-12Added data-ci-pagination-page="x" to pagination output so JS frameworks can ↵Phil Sturgeon1-7/+27
hook on.
2012-07-12Merge pull request #1609 from vkeranov/developPhil Sturgeon12-22/+13
helper fixes and small cleanup
2012-07-12Update developvkeranov1-1/+0
2012-07-12Update developvkeranov1-1/+0
2012-07-12Fix some spaces herevkeranov1-6/+5
2012-07-12again... new linesvkeranov1-1/+0
2012-07-12Too many new lines here :)vkeranov1-2/+1
2012-07-12Cleaning againvkeranov1-4/+3
2012-07-12Cleaning...vkeranov1-1/+0
2012-07-12Cleaning time...vkeranov1-1/+0
2012-07-12Important space fix :)vkeranov1-1/+1
2012-07-12Wrong url againvkeranov1-1/+1
2012-07-12Another typo...vkeranov1-1/+1
2012-07-12Fixed typo in the commentsvkeranov1-2/+1
2012-07-11Merge pull request #1607 from vlakoff/developPhil Sturgeon1-1/+1
Fix a typo in Common.php
2012-07-11Fix a typo in Common.phpvlakoff1-1/+1
2012-07-11Merge pull request #1604 from thatleeguy/developPhil Sturgeon1-1/+1
Fixing typo in error for multiple migration conflict.
2012-07-11Fixing typo in error for multiple migration conflict.lee Tengum1-1/+1
Signed-off-by: lee Tengum <lee@thatleeguy.com>
2012-07-10Follow-up to #1398, #1548Andrey Andreev2-2/+6
2012-07-10Merge pull request #1398 from gintsmurans/developAndrey Andreev1-14/+15
Change error_reporting(0) to ini_set('display_errors', 0);
2012-07-10Merge pull request #1548 from chrisguiney/error_reportingAndrey Andreev2-1/+3
Respect display_errors when deciding if to display an error...
2012-07-09Remove _drop_database property from CI_DB_odbc_forge and CI_DB_pdo_forge (it ↵Andrey Andreev2-2/+0
has the same default in CI_DB_forge)
2012-07-08Merge branch 'develop' of github.com:EllisLab/CodeIgniter into ↵Andrey Andreev19-55/+164
feature/db_subdrivers
2012-07-08Fix issue #1591Andrey Andreev1-1/+1
2012-07-08#1558Andrey Andreev2-0/+7
2012-07-07Merge pull request #1587 from jonnu/broken-croAndrey Andreev1-1/+1
missing '$this->' causing custom result objects to return as null/empty ...
2012-07-07missing '$this->' causing custom result objects to return as null/empty ↵Jon Ellis-Jones1-1/+1
arrays for ->row() and ->result() methods.
2012-07-06Fix a join() test ... dohAndrey Andreev1-1/+1
2012-07-06Fix a few join() bugsAndrey Andreev4-8/+29
2012-07-06Merge pull request #1581 from adityamenon/developPhil Sturgeon1-0/+4
Added info about set_*() functions and form_validation class in the Form Helper documentation.
2012-07-06_fetch_object(), custom_result_object() to utilize PHP's native capability ↵Andrey Andreev13-46/+123
to directly return custom class results
2012-07-06t commit -s 'Added info about set_*() functions and form_validation class inaditya1-0/+4
the Form Helper documentation.' Signed-off-by: aditya <adityamenon90@gmail.com>
2012-07-05Replace localhost with 127.0.0.1 and remove the PDO::ERRMODE_SILENT option - ↵Andrey Andreev10-10/+9
it's the default anyway
2012-07-05Merge branch 'develop' of github.com:EllisLab/CodeIgniter into ↵Andrey Andreev2-7/+35
feature/db_subdrivers
2012-07-05Fix PDO version()Andrey Andreev1-3/+14
2012-07-05Apparently mysql_data_seek() causes problems even when we suppress and ignore itAndrey Andreev1-4/+21
2012-07-05Merge upstream branchAndrey Andreev60-1596/+975
2012-07-05Fix pdo_result num_rows() for subdrivers that don't support rowCount()Andrey Andreev1-2/+2
2012-07-05Add a default _count_string propertyAndrey Andreev12-67/+8
2012-07-05Fix a typoAndrey Andreev1-1/+1
2012-07-05Clean-up the separate drivers' DB result classes from no longer needed methodsAndrey Andreev14-1167/+67
2012-07-05Optimize custom_result_object()Andrey Andreev1-4/+5
2012-07-05Merge pull request #1576 from Dumk0/patch-6Phil Sturgeon1-1/+1
improvement for latest migration id calculation
2012-07-05Don't fetch DB result sets twiceAndrey Andreev1-16/+59
2012-07-05Suppress mysql_data_seek()'s ambiguous E_WARNING messagesAndrey Andreev1-1/+1
2012-07-05Change DB_result::num_rows default value to NULLAndrey Andreev5-27/+60