Fix duplicated method caused by bad merge.
Fix duplicated method caused by bad merge.

ADmad/cakephp,ADmad/cakephp,ndm2/cakephp,ndm2/cakephp,cakephp/cakephp,CakeDC/cakephp,CakeDC/cakephp,cakephp/cakephp,ADmad/cakephp,cakephp/cakephp,CakeDC/cakephp,ADmad/cakephp,ndm2/cakephp,cakephp/cakephp,ndm2/cakephp,CakeDC/cakephp