Upgrade for CodeIgniter 2.1.3 and PHP 5.4