daledotshan/liferay-portal — pull request #18 by yuhai (2011-12-14 08:10:43+00:00)
Title: LPS-21633 Bookmarks - 'The folder could not be found' error message when merging a subfolder with its parent folder

There are two logic occuring when edit subfolder, one is only update ,the other is mergeWithParentFolder to update. There are two different redirect when click "edit"(as the LPS-21633 description), the page is wrong("The folder could not ne found) after updating because folderID in redirect is deleted by checked mergeWithParentFolder. So it need to parentfolderID instead of folderID(deleted) in redirect.