* Ported [2438] to 1.2.9

svn: 2593

doc/UPDATES

@@ -24,6 +24,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fixed a mem leak on bot unlinks.
 * Fixed an error with msg-* displaying as msg* in 'help set'. (seinfeld)
 * Setting 'manop-warn' was only being used for 'OP #chan' not 'OP' alone.
+* Fixed channel notices not being parsed.
 
 1.2.8
 * Fixed [bot]* cmds depending on case of botnicks.

src/mod/irc.mod/chan.c

@@ -3056,9 +3056,6 @@ static int gotnotice(char *from, char *msg)
   char *to = newsplit(&msg), *realto = (*to == '@') ? to + 1 : to;
   struct chanset_t *chan = findchan(realto); 
 
-  ignoring = match_ignore(from);
-  to = newsplit(&msg);
-  realto = (*to == '@') ? to + 1 : to;
   chan = findchan(realto);
   if (!chan)
     return 0;			/* Notice to an unknown channel?? */
@@ -3140,13 +3137,10 @@ static int gotnotice(char *from, char *msg)
     if (!chan)
       return 0;
 
-    if (!ignoring || trigger_on_ignore) {
-      chan = findchan(realto); 
-      if (!chan)
-	return 0;
-    }
-    irc_log(chan, "-%s:%s- %s", nick, to, msg);
     update_idle(chan->dname, nick);
+
+    if (!ignoring)
+      irc_log(chan, "-%s:%s- %s", nick, to, msg);
   }
   return 0;
 }