Use semicolon instead of ampersand to separate arguments.

[pr0n] / perl / Sesse / pr0n / Common.pm

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 1c864fc6d8a88b07ad5b599cfa54b8389ff9671d..3ab1c6b46ae49827d3a872e99f77167d12c51e41 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -11,6 +11,7 @@ use Apache2::Const -compile => ':common';
 use Apache2::Log;
 use ModPerl::Util;
 
+use Carp;
 use DBI;
 use DBD::Pg;
 use Image::Magick;
@@ -31,7 +32,7 @@ BEGIN {
                require Sesse::pr0n::Config_local;
        };
 
-       $VERSION     = "v2.10";
+       $VERSION     = "v2.11";
        @ISA         = qw(Exporter);
        @EXPORT      = qw(&error &dberror);
        %EXPORT_TAGS = qw();
@@ -67,6 +68,7 @@ sub error {
         footer($r);
 
        $r->log->error($err);
+       $r->log->error("Stack trace follows: " . Carp::longmess());
 
        ModPerl::Util::exit();
 }
@@ -126,7 +128,7 @@ sub get_query_string {
                next unless defined($value);
                next if (defined($defparam->{$key}) && $value == $defparam->{$key});
        
-               $str .= ($first) ? "?" : '&';
+               $str .= ($first) ? "?" : ';';
                $str .= "$key=$value";
                $first = 0;
        }
@@ -134,8 +136,12 @@ sub get_query_string {
 }
 
 sub print_link {
-       my ($r, $title, $baseurl, $param, $defparam) = @_;
-       my $str = "<a href=\"$baseurl" . get_query_string($param, $defparam) . "\">$title</a>";
+       my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_;
+       my $str = "<a href=\"$baseurl" . get_query_string($param, $defparam) . "\"";
+       if (defined($accesskey) && length($accesskey) == 1) {
+               $str .= " accesskey=\"$accesskey\"";
+       }
+       $str .= ">$title</a>";
        $r->print($str);
 }