daledotshan/liferay-portal — pull request #19 by yuhai (2011-12-16 06:35:13+00:00)
Title: LPS-21633 Bookmarks - 'The folder could not be found' error message when...

... merging a subfolder with its parent folder

It should disable mergeWithParentFolder function when you are currently accessing this folder to edit