Age | Commit message (Collapse) | Author | Files | Lines |
|
Conflicts resolved:
system/core/CodeIgniter.php
system/libraries/Cache/drivers/Cache_redis.php
system/libraries/Session/drivers/Session_redis_driver.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
|
|
|
|
Adding support for proper CRLF
|
|
Removed extra space, before and after concatenation.
|
|
Changed to use PHP_EOL instead of `/r/n`
|
|
Also added `\r\n` to pass the test case
|
|
Conflicts resolved:
system/database/drivers/sqlite/sqlite_driver.php
system/database/drivers/sqlite/sqlite_forge.php
system/database/drivers/sqlite/sqlite_result.php
system/database/drivers/sqlite/sqlite_utility.php
system/helpers/captcha_helper.php
system/helpers/email_helper.php
system/helpers/inflector_helper.php
system/helpers/smiley_helper.php
system/language/english/form_validation_lang.php
system/libraries/Cart.php
system/libraries/Form_validation.php
system/libraries/Javascript.php
system/libraries/Javascript/Jquery.php
system/libraries/Session/SessionHandlerInterface.php
tests/codeigniter/helpers/inflector_helper_test.php
user_guide_src/source/helpers/inflector_helper.rst
|
|
|
|
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
|
|
|
|
|
|
|
|
Fixed issue #5462 Query Builder LIKE BEFORE doesnt work
|
|
|
|
|
|
Clean elses
|
|
Clean elses
|
|
Refactoring tests
Conflicts resolved:
tests/codeigniter/core/Utf8_test.php
tests/codeigniter/database/query_builder/group_test.php
tests/codeigniter/libraries/Form_validation_test.php
|
|
|
|
|
|
Note: This intentionally reverts ee8324368f2844aae0d558f1d194419a2181c281
|
|
|
|
|
|
Clean up form validation tests
|
|
Remove a number unnecessary calls to reset_validation(). A new
form_validation object is already initialized for every test in
set_up(), so these lines do nothing unless multiple validations
are done in the same test.
Explicitly empty the $_POST array after each test that modifies it.
Signed-off-by: Zach Ploskey <zach@ploskey.com>
|
|
Fix attempting to access data_ref before it is defined when
validating an array input with multiple explicitly specified keys.
Adds a test for the issue.
Signed-off-by: Zach Ploskey <zach@ploskey.com>
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
|
|
Conflicts resolved:
system/core/CodeIgniter.php
tests/codeigniter/libraries/Form_validation_test.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
|
|
|
|
Fix CI_DB_query_builder::count_all_results() returning wrong count with LIMIT/OFFSET
|
|
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
|
|
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
|
|
Conflicts resolved:
system/core/CodeIgniter.php
system/core/Common.php
system/core/Input.php
system/helpers/cookie_helper.php
tests/codeigniter/helpers/html_helper_test.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
user_guide_src/source/libraries/input.rst
|
|
|
|
|
|
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
|
|
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
|
|
|
|
Spelling fixes in comment blocks and docs
|
|
|
|
Conflicts resolved:
system/core/CodeIgniter.php
system/database/drivers/sqlite/sqlite_driver.php
system/database/drivers/sqlite/sqlite_forge.php
system/database/drivers/sqlite/sqlite_result.php
system/database/drivers/sqlite/sqlite_utility.php
system/helpers/email_helper.php
system/helpers/smiley_helper.php
system/libraries/Cart.php
system/libraries/Email.php
system/libraries/Image_lib.php
system/libraries/Javascript.php
system/libraries/Javascript/Jquery.php
system/libraries/Session/SessionHandlerInterface.php
user_guide_src/source/changelog.rst
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
|
|
|
|
Close #3992
|
|
|
|
|