fixes if conditions, and uses optional return value of
fixes if conditions, and uses optional return value of

cakephp/cakephp,cakephp-fr/cakephp,cakephp-fr/cakephp,dakota/cakephp,nrother/cakephp,jeffblack360/cakephp,dakota/cakephp,cakephp/cakephp,elboletaire/cakephp,nrother/cakephp,mvdriel/cakephp,CVO-Technologies/cakephp,petteyg/cakephp,ndm2/cakephp,CakeDC/cakephp,dakota/cakephp,davidyell/cakephp,davidyell/cakephp,elboletaire/cakephp,jeffblack360/cakephp,CVO-Technologies/cakephp,cakephp/cakephp,cakephp-fr/cakephp,tenkoma/cakephp,berrygoudswaard/cakephp,ADmad/cakephp,cakephp/cakephp,mvdriel/cakephp,CVO-Technologies/cakephp,HavokInspiration/cakephp,thinkingmedia/cakephp,HavokInspiration/cakephp,ADmad/cakephp,tenkoma/cakephp,garethellis36/cakephp,berrygoudswaard/cakephp,ndm2/cakephp,davidyell/cakephp,ionas/cakephp,petteyg/cakephp,CakeDC/cakephp,tenkoma/cakephp,ndm2/cakephp,garethellis36/cakephp,ndm2/cakephp,nrother/cakephp,tenkoma/cakephp,petteyg/cakephp,mvdriel/cakephp,CakeDC/cakephp,ADmad/cakephp,garethellis36/cakephp,ADmad/cakephp,thinkingmedia/cakephp,thinkingmedia/cakephp,elboletaire/cakephp,ionas/cakephp,berrygoudswaard/cakephp,garethellis36/cakephp,dakota/cakephp,HavokInspiration/cakephp,CakeDC/cakephp,jeffblack360/cakephp,ionas/cakephp,petteyg/cakephp,mvdriel/cakephp