Merge branch 'master' into release

This commit is contained in:
Alex Bramley 2011-08-03 08:03:20 +01:00
commit cd53356ca6
1 changed files with 2 additions and 3 deletions

View File

@ -68,7 +68,7 @@ func parseLine(s string) *Line {
strings.HasPrefix(line.Args[1], "\001") && strings.HasPrefix(line.Args[1], "\001") &&
strings.HasSuffix(line.Args[1], "\001") { strings.HasSuffix(line.Args[1], "\001") {
// WOO, it's a CTCP message // WOO, it's a CTCP message
t := strings.Split(strings.Trim(line.Args[1], "\001"), " ", 2) t := strings.SplitN(strings.Trim(line.Args[1], "\001"), " ", 2)
if len(t) > 1 { if len(t) > 1 {
// Replace the line with the unwrapped CTCP // Replace the line with the unwrapped CTCP
line.Args[1] = t[1] line.Args[1] = t[1]
@ -85,4 +85,3 @@ func parseLine(s string) *Line {
} }
return line return line
} }