I just tested the fix code, and it is working for me.
Double check that the updated admin_cms/contents_insert.php and admin_cms/contents_update.php pages are being properly uploaded to the server.
I a couple of instances, I have not seen changes to the toolbar code "take" until I performed a hard refresh on the browser using the ctrl+F5 key combination.