diff --git a/PBot/FactoidCommands.pm b/PBot/FactoidCommands.pm
index ee402df8..b6802f5d 100644
--- a/PBot/FactoidCommands.pm
+++ b/PBot/FactoidCommands.pm
@@ -309,12 +309,13 @@ sub factrem {
if(($nick ne $factoids->{$channel}->{$trigger}->{owner}) and (not $self->{pbot}->admins->loggedin($from, "$nick!$user\@$host"))) {
$self->{pbot}->logger->log("$nick!$user\@$host attempted to remove $trigger [not owner]\n");
- return "/msg $nick You are not the owner of '$trigger'";
+ my $chan = ($channel eq '.*' ? 'the global channel' : $channel);
+ return "/msg $nick You are not the owner of '$trigger' for $chan";
}
$self->{pbot}->logger->log("$nick!$user\@$host removed [$channel][$trigger][" . $factoids->{$channel}->{$trigger}->{action} . "]\n");
$self->{pbot}->factoids->remove_factoid($channel, $trigger);
- return "/msg $nick $trigger removed from " . ($channel eq '.*' ? 'global channel' : $channel) . ".";
+ return "/msg $nick $trigger removed from " . ($channel eq '.*' ? 'the global channel' : $channel) . ".";
}
sub histogram {
diff --git a/PBot/Factoids.pm b/PBot/Factoids.pm
index 3cf08f8c..db17a31f 100644
--- a/PBot/Factoids.pm
+++ b/PBot/Factoids.pm
@@ -121,13 +121,13 @@ sub export_factoids {
my $time = localtime;
print FILE "Last updated at $time\n";
- print FILE "
Candide's factoids:
\n";
+ print FILE "
Candide's factoids
\n";
my $i = 0;
foreach my $channel (sort keys %{ $self->factoids->hash }) {
my $chan = $channel eq '.*' ? 'Global channel' : "Channel $channel";
- print FILE "
\n$chan\n
\n";
+ print FILE "
\n$chan\n
\n";
print FILE "
\n";
foreach my $trigger (sort keys %{ $self->factoids->hash->{$channel} }) {
if($self->factoids->hash->{$channel}->{$trigger}->{type} eq 'text') {
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index 4ab7b487..01285275 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,8 +13,8 @@ use warnings;
# These are set automatically by the build/commit script
use constant {
BUILD_NAME => "PBot",
- BUILD_REVISION => 214,
- BUILD_DATE => "2010-06-28",
+ BUILD_REVISION => 215,
+ BUILD_DATE => "2010-06-29",
};
1;