|
|
@ -204,14 +204,12 @@ abstract class Target extends Component |
|
|
|
if ($matched) { |
|
|
|
if ($matched) { |
|
|
|
foreach ($this->except as $category) { |
|
|
|
foreach ($this->except as $category) { |
|
|
|
$prefix = rtrim($category, '*'); |
|
|
|
$prefix = rtrim($category, '*'); |
|
|
|
foreach ($messages as $i => $message) { |
|
|
|
|
|
|
|
if (strpos($message[2], $prefix) === 0 && ($message[2] === $category || $prefix !== $category)) { |
|
|
|
if (strpos($message[2], $prefix) === 0 && ($message[2] === $category || $prefix !== $category)) { |
|
|
|
$matched = false; |
|
|
|
$matched = false; |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!$matched) { |
|
|
|
if (!$matched) { |
|
|
|
unset($messages[$i]); |
|
|
|
unset($messages[$i]); |
|
|
|