Adding fix for Ticket #856, and additional code formatting fixes
Adding fix for Ticket #856, and additional code formatting fixes


git-svn-id: 5860920b332e8b1c20d5ac1ddb0cfb1512ef151a@3098 3807eeeb-6ff5-0310-8944-8be069107fe0

gmponos/cakephp,akintoey/cakephp,et304383/passbolt_api,nrother/cakephp,cakephp/cakephp,Balachan27/cakephp,dkarvounaris/cakephp,burriko/cakephp,nrother/cakephp,dakota/cakephp,tisu2tisu/cakephp,dakota/cakephp,tgr0ss/cakephp,erikfig/cakephp,thinkingmedia/cakephp,tenkoma/cakephp,nrother/cakephp,ADmad/cakephp,garethellis36/cakephp,justinyost/cakephp,petteyg/cakephp,cakephp-fr/cakephp,jeffblack360/cakephp,eryw/cakephp,pbaire/cakephp,dkarvounaris/cakephp,akintoey/cakephp,yinhe007/cakephp,gmponos/cakephp,CVO-Technologies/cakephp,eryw/cakephp,CVO-Technologies/cakephp,web-player/cakephp,eboominathan/cakephp,davidyell/cakephp,khoimt/cakephp-study,CakeDC/cakephp,michaelze/cakephp,et304383/passbolt_api,jjj117/cakephp,web-player/cakephp,justinyost/cakephp,jjj117/cakephp,garethellis36/cakephp,burriko/cakephp,Phillaf/cakephp,eboominathan/cakephp,timhoeppner/cakephp,kumamidori/cakephp,cakephp/cakephp,ndm2/cakephp,ADmad/cakephp,web-player/cakephp,ndm2/cakephp,Balachan27/cakephp,adopico/cakephp,HavokInspiration/cakephp,dakota/cakephp,Balachan27/cakephp,pbaire/cakephp,michaelze/cakephp,davidyell/cakephp,elboletaire/cakephp,timhoeppner/cakephp,tisu2tisu/cakephp,ionas/cakephp,tgr0ss/cakephp,cakephp/cakephp,yinhe007/cakephp,elboletaire/cakephp,berrygoudswaard/cakephp,kumamidori/cakephp,ADmad/cakephp,akintoey/cakephp,et304383/passbolt_api,mvdriel/cakephp,petteyg/cakephp,CakeDC/cakephp,burriko/cakephp,garethellis36/cakephp,tenkoma/cakephp,CakeDC/cakephp,mvdriel/cakephp,justinyost/cakephp,cakephp-fr/cakephp,timhoeppner/cakephp,thinkingmedia/cakephp,HavokInspiration/cakephp,eboominathan/cakephp,tenkoma/cakephp,HavokInspiration/cakephp,CakeDC/cakephp,jerems02/cakephp,et304383/passbolt_api,eryw/cakephp,bravo-kernel/cakephp,Phillaf/cakephp,dakota/cakephp,petteyg/cakephp,jeffblack360/cakephp,berrygoudswaard/cakephp,bravo-kernel/cakephp,ndm2/cakephp,davidyell/cakephp,cakephp/cakephp,khoimt/cakephp-study,bravo-kernel/cakephp,cakephp-fr/cakephp,berrygoudswaard/cakephp,Phillaf/cakephp,ionas/cakephp,mvdriel/cakephp,michaelze/cakephp,kumamidori/cakephp,tgr0ss/cakephp,elboletaire/cakephp,ADmad/cakephp,erikfig/cakephp,erikfig/cakephp,dkarvounaris/cakephp,adopico/cakephp,pbaire/cakephp,et304383/passbolt_api,tisu2tisu/cakephp,ndm2/cakephp,khoimt/cakephp-study,CVO-Technologies/cakephp,garethellis36/cakephp,tenkoma/cakephp,gmponos/cakephp,adopico/cakephp,thinkingmedia/cakephp,jerems02/cakephp,ionas/cakephp,mvdriel/cakephp,jeffblack360/cakephp,jerems02/cakephp,jjj117/cakephp,yinhe007/cakephp,petteyg/cakephp