* Ported [2435] to 1.2.9

svn: 2592

doc/UPDATES

@@ -23,6 +23,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fixed cmd_[bot]set showing an invalid example for using '-YES'
 * 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.
 
 1.2.8
 * Fixed [bot]* cmds depending on case of botnicks.

src/mod/irc.mod/msgcmds.c

@@ -148,7 +148,7 @@ static int msg_op(char *nick, char *host, struct userrec *u, char *par)
           if (chk_op(fr, chan)) {
             if (do_op(nick, chan, 0, 1)) {
               stats++;
-              if (chan->manop)
+              if (manop_warn && chan->manop)
                 dprintf(DP_HELP, "NOTICE %s :%s is currently set to punish for manual op.\n", nick, chan->dname);
             }
           }