RadioactivityIncident.inc line 92, bad second argument for db_merge()

Hi,

the described issue is present from version 2.0 to 2.2 (I didn't try the dev code). It breaks every part of a site, from cron to admin pages, to each AJAX response. It furthermore causes sending of the HTTP headers from the middle of the bootstrap.

I just fixed it in my dev site, but don't know how to provide a patch. So please could someone build the patch or even better include it in the dev ASAP.

Line 92 of RadioactivityIncident.inc calls:

db_merge('radioactivity_flood_map', 'fm');

The second argument obviously is meant to be an alias for the flood map table. This would be valid for db_select(), but not for db_merge(), for which the second argument has to be an array of $options. The solution is to remove the argument so the line remains like:

db_merge('radioactivity_flood_map');

I didn't check if the rest of the function is working like expected. All I did is getting rid of the error.

Shnapoo