4.7 version conflicts with Core HTML filter (as of 4.7.11)

On my 4.7-installations, all my pages with code on it show no text. See here: http://www.gerd-riesselmann.net/php-beware-of-variables-inside-strings

I think its the same issue as with Drupal 5.6, as discussed here: http://drupal.org/node/208636. Since it is the same Fix that got applied to 4.7., too: http://drupal.org/node/208564.

So I guess it should be OK to just backport the changes made for the 5.x branch.