import rt 3.0.12

6 files changed, 17 insertions, 10 deletions

diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index 0fd91a2e2..23ab5f781 100644
--- a/rt/html/Elements/Header
+++ b/rt/html/Elements/Header
@@ -58,7 +58,6 @@ ONLOAD="
 % } else {
 <&|/l&>Not logged in.</&>
 % }
-</font>
     </td>
   </tr>
 </table>
diff --git a/rt/html/Elements/Menu b/rt/html/Elements/Menu
index 963be13bf..5cc8ab773 100644
--- a/rt/html/Elements/Menu
+++ b/rt/html/Elements/Menu
@@ -56,7 +56,7 @@
 % } else {
 % $sep=0;
 % }
-<li style="<%$style%>"><A HREF="<%$RT::WebPath%>/<%$toptabs->{$tab}->{'path'}|n%>" style="font-size: <%$size%>;" class="<%$class%>" 
+<li style="<%$style%>"><A HREF="<%($toptabs->{$tab}->{'path'} !~ m/^https?:/i) ? $RT::WebPath."/" : ""%><%$toptabs->{$tab}->{'path'}|n%>" style="font-size: <%$size%>;" class="<%$class%>"
 <%($class eq 'currenttopnav') ? "name='focus'" : ""|n %> 
 <% !$level && "accesskey='".$accesskey++."'" |n%>><% $toptabs->{$tab}->{'title'}%></A>
 %# Second-level items
diff --git a/rt/html/Elements/MessageBox b/rt/html/Elements/MessageBox
index 32f422206..2f241a158 100644
--- a/rt/html/Elements/MessageBox
+++ b/rt/html/Elements/MessageBox
@@ -21,7 +21,7 @@
 %# 
 %# 
 %# END LICENSE BLOCK
-<TEXTAREA COLS=<%$Width%> ROWS=15 WRAP=<%$Wrap%> NAME="<%$Name%>"><& /Elements/Callback, %ARGS &><% $Default %><%$message%><%$IncludeSignature ? $signature : ''%></TEXTAREA>
+<TEXTAREA COLS=<%$Width%> ROWS=<%$Height%> WRAP=<%$Wrap%> NAME="<%$Name%>"><& /Elements/Callback, %ARGS &><% $Default %><%$message%><%$IncludeSignature ? $signature : ''%></TEXTAREA>
 <%INIT>
 
 my ($message);
@@ -33,7 +33,7 @@ if ($QuoteTransaction) {
 }
 
 my $signature = '';
-if ($session{'CurrentUser'}->UserObj->Signature) {
+if ($IncludeSignature && $session{'CurrentUser'}->UserObj->Signature) {
 	$signature = "-- \n".$session{'CurrentUser'}->UserObj->Signature;
 }
 
@@ -42,8 +42,9 @@ if ($session{'CurrentUser'}->UserObj->Signature) {
 $QuoteTransaction => undef
 $Name => 'Content'
 $Default => ''
-$Width => $RT::MessageBoxWidth
-$Wrap => $RT::MessageBoxWrap
+$Width => $RT::MessageBoxWidth || 72
+$Height => $RT::MessageBoxHeight || 15
+$Wrap => $RT::MessageBoxWrap || 'HARD'
 $IncludeSignature => 1
 </%ARGS>
 
diff --git a/rt/html/Elements/MyRequests b/rt/html/Elements/MyRequests
index 05ae62445..da6fb1f7b 100644
--- a/rt/html/Elements/MyRequests
+++ b/rt/html/Elements/MyRequests
@@ -66,7 +66,7 @@
 
 
 <%INIT>
-my $rows = 10;
+my $rows = $RT::MyRequestsLength;
 my $MyTickets;
 $MyTickets = new RT::Tickets ($session{'CurrentUser'});
 $MyTickets->LimitWatcher(TYPE => 'Requestor', VALUE => $session{'CurrentUser'}->EmailAddress);
diff --git a/rt/html/Elements/QueryString b/rt/html/Elements/QueryString
new file mode 100644
index 000000000..36c467938
--- /dev/null
+++ b/rt/html/Elements/QueryString
@@ -0,0 +1,7 @@
+<%init>
+my @params;
+while ( (my $key, my $value) = each %ARGS ){
+	push @params, $key."=".$m->interp->apply_escapes($value,'u');
+}
+return(join('&',@params));
+</%init>
diff --git a/rt/html/Elements/SelectMatch b/rt/html/Elements/SelectMatch
index d58a9633a..c291537e1 100644
--- a/rt/html/Elements/SelectMatch
+++ b/rt/html/Elements/SelectMatch
@@ -38,13 +38,13 @@ $Default => undef
 </%ARGS>
 <%INIT>
 my ($TrueDefault, $FalseDefault, $LikeDefault, $NotLikeDefault);
-if ($Default && $Default !~ /true/i) {
+if ($Default && $Default =~ /false/i) {
 	$FalseDefault = "SELECTED";
 }
-elsif ($Default && $Default !~ /false/i) {
+elsif ($Default && $Default =~ /true/i) {
 	$TrueDefault = "SELECTED";
 } 
-elsif ($Default && $Default !~ /notlike/i) {
+elsif ($Default && $Default =~ /notlike/i) {
 	$NotLikeDefault = "SELECTED";
 }
 else {