silverstripe/silverstripe-framework — pull request #1996 by patbolo (2013-05-24 23:10:15+00:00)
Title: FIX CMS-445 Avoid collision of status flags in tree items when updating ...

...tree nodes. This is to avoid tree items still being striked through after a restore. Issue is that when the node gets its classes repopulated, so that js-leaf is preserved, the old status flag is kept, and the new status flag is merged. As a result, conflicting classes are both in the class attributes. This patch ensures old status are not merged if they are not present in the returned html. This fix is related to https://github.com/silverstripe/silverstripe-cms/issues/445
On a side note, I noticed another issue where the message when restoring is the escaped version of the html for the tree node, not the page title. I ensured my patch is not responsible for that regression.