fix the nasty feature in perl 5.6 with my $ref = $foo if $bar for

[spider.git] / perl / Thingy.pm

diff --git a/perl/Thingy.pm b/perl/Thingy.pm
index efacdbb3219f0864a587098e841229abd404ee8a..afc2129b913641eaaaf641330781de873bc535cd 100644 (file)
--- a/perl/Thingy.pm
+++ b/perl/Thingy.pm
@@ -78,7 +78,7 @@ sub send
        # function must return true to make the send happen
        $sub = "before_send_$class";
        if ($thing->can($sub)) {
-               return $thing->$sub($dxchan);
+               return unless $thing->$sub($dxchan);
        }
        
        # generate the protocol line which may (or not) be cached
@@ -113,7 +113,8 @@ sub broadcast
        dbg("Thingy::broadcast: " . $thing->ascii) if isdbg('thing'); 
 
        my @dxchan;
-       my $to ||= $thing->{touser};
+       my $to ||= $thing->{route}; 
+       $to     ||= $thing->{touser};
        $to ||= $thing->{group};
        if ($to && is_callsign($to) && (my $ref = Route::get($to))) {
                dbg("Thingy::broadcast: routing for $to") if isdbg('thing');
@@ -217,7 +218,7 @@ sub ascii
        my $dd = new Data::Dumper([$thing]);
        $dd->Indent(0);
        $dd->Terse(1);
-       $dd->Sortkeys(1);
+       #$dd->Sortkeys(1);
     $dd->Quotekeys($] < 5.005 ? 1 : 0);
        return $dd->Dumpxs;
 }