Merge branch 'color-flood-exempt' into maint

* color-flood-exempt:
  Properly lookup user when checking noflood() flags

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -6,6 +6,7 @@ maint
   * Fix CALLERID not respecting ignores (#63)
   * When using msg OP, check for and allow '#chan PASS' as well as 'PASS #chan'
   * Warn when using 'chattr +a' as some users may expect it to be auto-op (#58)
+  * Really fix CAPS/COLOR flood detection not obeying x|x flags
 
 1.4.1 - http://wraith.botpack.net/milestone/1.4.1
   * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.

src/mod/irc.mod/irc.c

@@ -122,9 +122,10 @@ detect_offense(memberlist* m, struct chanset_t *chan, char *msg)
       || chan_sentkick(m)) //sanity check
     return 0;
 
+  member_getuser(m, 0);
+
   struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
-  struct userrec *u = m->user ? m->user : get_user_by_host(m->userhost);
-  get_user_flagrec(u, &fr, chan->dname, chan);
+  get_user_flagrec(m->user, &fr, chan->dname, chan);
 
   if (glob_bot(fr) ||
       chk_noflood(fr) ||