Fix #3238

Close #3239
Fix a defined() check

Close #3233
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop