fixed bug #2189 with CMF toolbar
Merge pull request #2290 from neok/cmf_toolbar_menu_fix

fixed bug #2189 with CMF toolbar