search

benedmunds / CodeIgniter-Ion-Auth

Simple and Lightweight Auth System for CodeIgniter
http://benedmunds.com/ion_auth/
MIT License
2.35k stars 1.14k forks source link

fixbug ci4 filterData #1531

Closed junglaCODE closed 3 years ago

junglaCODE commented 3 years ago

Send changes in the function filterData related with issue #1528 . I hope it is helpful for this great library :)

benedmunds commented 3 years ago

There's something wrong with this PR. It should only have the one commit, this is showing 55. Did you branch and pull the latest to your base branch? And are you merging with the current target branch?

junglaCODE commented 3 years ago

this branch generated merge with conflicts, It was weird, but I ignored it. What I can do ?

benedmunds commented 3 years ago

The easiest way is to probably pull down the 4 branch to a new branch, cherry pick your commit, then submit a new PR

junglaCODE commented 3 years ago

ok. working in issue. Thanks