User: stalski Branch: DRUPAL-6--4 Date: Thu, 20 Aug 2009 21:34:32 +0000 Modified files: /modules/heartbeat heartbeat.module heartbeat.rules.inc heartbeat.rules_defaults.inc /modules/heartbeat/includes heartbeatactivity.inc heartbeatparser.inc publicheartbeat.inc /modules/heartbeat/modules/friendlist_activity friendlist_activity.rules_defaults.inc /modules/heartbeat/modules/og_activity og_activity.rules_defaults.inc /modules/heartbeat/modules/shouts shouts.rules_defaults.inc Log message: Fixed the duplicate user-user bug again, this time i think it is the nicest solution by setting a flag for it when the two users are action equally. Changed the way user-user logging happens and the that's was the main reason why heartbeat provides two actions to use in rules ui. one active user versus two active users. Changed all default rules that needed adaptation Links: http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/heartbea... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/heartbea... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/heartbea... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/includes... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/includes... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/includes... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/modules/... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/modules/... http://cvs.drupal.org/diff.php?path=contributions/modules/heartbeat/modules/...