Fatal error: Cannot use string offset as an array in D:\xnetpub\Drupal-developer\modules\filter.module on line 842

I have two problems I can't seem to get rich text support at all for non-admin users and admin users using rich text support are getting this problem from filters.

I found http://drupal.org/node/62071 from 5 May 2006 where webchick issued a patch which makes reference to:
- $form = array_merge($form, filter_form($node->format));
+ $form['body_filter']['format'] = filter_form($node->format);

and said "If so please submit a similar patch to Bio module and whatever other ones are exhibiting this problem."

There's a call to array_merge on line 94:
return array_merge($form, filter_form($node->format));

So does tis just need changing to
return filter_form($node->format);

or should it be
$form['format'] = filter_form($node->format);