joomla/joomla-cms — pull request #191 by garyamort (2012-04-13 11:57:56+00:00)
Title: Updated prepareContent, moved $conflicts to the parameters 

Ran into a case where other plugins where causing problems in prepareContent. In order to work around this, I had to duplicate the entire prepareContent method in my plugin in order to change the list of excluded plugins. As a proposed solution, I've moved the $conflicts array to the parameters for prepareContent. If not given, it defaults to what it was before, if given it overrides it and allows different plugins to be excluded.