? mw.patch
? svnmerge-commit-message.txt
Index: flag.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flag/Attic/flag.module,v
retrieving revision 1.11.2.44
diff -u -F^f -p -r1.11.2.44 flag.module
--- flag.module	30 Sep 2008 03:08:49 -0000	1.11.2.44
+++ flag.module	3 Oct 2008 14:29:51 -0000
@@ -1066,7 +1066,7 @@ function flag_get_user_flags($content_ty
       $flagged_content[$uid]['all'][$content_type] = TRUE;
       $result = db_query("SELECT * FROM {flag_content} WHERE content_type = '%s' AND (uid = %d OR uid = 0)", $content_type, $uid);
       while ($flag = db_fetch_object($result)) {
-        $flagged_content[$uid][$content_type]['all'][$flags[$flag->fid]->name] = $flag;
+        $flagged_content[$uid][$content_type]['all'][$flags[$flag->fid]->name][$flag->content_id] = $flag;
       }
     }
     return $flagged_content[$uid][$content_type]['all'];