merge in rt 3.6.6. *gulp*!

diff --git a/rt/etc/RT_Config.pm.in b/rt/etc/RT_Config.pm.in
index 0657d3d..cf089fb 100644 (file)
--- a/rt/etc/RT_Config.pm.in
+++ b/rt/etc/RT_Config.pm.in
@@ -505,6 +505,13 @@ Set($SuppressInlineTextFiles, undef);
 
 Set($DontSearchFileAttachments, undef);
 
+# The GD module (which RT uses for graphs) uses a builtin font that doesn't
+# have full Unicode support. You can use a particular TrueType font by setting
+# $ChartFont to the absolute path of that font. Your GD library must have
+# support for TrueType fonts to use this option.
+
+Set($ChartFont, undef);
+
 
 # }}}
 

diff --git a/rt/html/Elements/CollectionAsTable/Row b/rt/html/Elements/CollectionAsTable/Row
index 64ecef4..d849226 100644 (file)
--- a/rt/html/Elements/CollectionAsTable/Row
+++ b/rt/html/Elements/CollectionAsTable/Row
@@ -55,6 +55,7 @@ $Warning => undef
 </%ARGS>
 
 <%PERL>
+use HTML::Entities;
 $m->out('<tr class="' . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
 my $item;
 foreach my $column (@Format) {
@@ -71,7 +72,9 @@ foreach my $column (@Format) {
         next;
     }
     $item++;
-    $m->out('<td class="collection-as-table" ');
+    my $class = $column->{class}
+       ? encode_entities($column->{class}, q{'"&<>}) : 'collection-as-table';
+    $m->out(qq{<td class="$class" });
     $m->out( 'align="' . $column->{align} . '"' ) if ( $column->{align} );
     $m->out( 'style="' . $column->{style} . '"' ) if ( $column->{style} );
     $m->out('>');

diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index 4ac38cd..bf6fa46 100644 (file)
--- a/rt/html/Elements/Header
+++ b/rt/html/Elements/Header
@@ -58,7 +58,7 @@
 % }
 
 <link rel="shortcut icon" href="<%$RT::WebImagesURL%>/favicon.png" type="image/png" />
-<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/css/<% $RT::WebDefaultStylesheet %>/main.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/css/<% $RT::WebDefaultStylesheet %>/main-squished.css" type="text/css" media="all" />
 <link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/css/print.css" type="text/css" media="print" />
 
 % if ( $RSSAutoDiscovery ) {

diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout
index 1aa1490..b9fd31f 100644 (file)
--- a/rt/html/Elements/PageLayout
+++ b/rt/html/Elements/PageLayout
@@ -75,9 +75,11 @@
     <TR HEIGHT="100%">
       <TD>
 
+% if ( $show_menu ) {
 <div id="nav">
 <& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &>
 </div>
+% }
 
 <div id="header">
   <h1><%$title%></h1>
@@ -250,4 +252,5 @@ $actions => undef
 $subactions => undef
 $title => $m->callers(-1)->path
 $AppName => undef
+$show_menu => 1
 </%ARGS>

diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs
index f94711c..9d1eea6 100644 (file)
--- a/rt/html/Elements/Tabs
+++ b/rt/html/Elements/Tabs
@@ -53,7 +53,8 @@
     tabs => $tabs,
     actions => $actions,
     subactions => $subactions,
-    title => $Title
+    title => $Title,
+    show_menu => $show_menu,
 &>
 <a name="skipnav" id="skipnav" accesskey="8"></a>
 <%INIT>
@@ -132,4 +133,5 @@ $tabs => undef
 $actions => undef
 $subactions => undef
 $Title => undef
+$show_menu => 1
 </%ARGS>

diff --git a/rt/html/Ticket/Elements/ShowTransactionAttachments b/rt/html/Ticket/Elements/ShowTransactionAttachments
index b014d07..85e04e5 100644 (file)
--- a/rt/html/Ticket/Elements/ShowTransactionAttachments
+++ b/rt/html/Ticket/Elements/ShowTransactionAttachments
@@ -182,9 +182,9 @@ $m->comp(
     ParentObj => $message
 );
 
-}
 </%PERL>
 </div>
+% }
 <%ARGS>
 $Ticket => undef
 $Transaction => undef

diff --git a/rt/html/Widgets/TitleBoxStart b/rt/html/Widgets/TitleBoxStart
index 1320b8f..1d8548d 100755 (executable)
--- a/rt/html/Widgets/TitleBoxStart
+++ b/rt/html/Widgets/TitleBoxStart
@@ -64,8 +64,6 @@ $title => ''
 $title_class => ''
 $titleright_href => undef
 $titleright => undef
-$contentbg => "#d4d4d4"
-$color => "#336699"
 $id => ''
 $hideable => 1
 </%ARGS>

diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index 98d965c..cf607e2 100644 (file)
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -586,7 +586,7 @@ sub insert_data {
             my ($return,$msg) = $new_entry->Create(%$item);
             unless ($return) {
                 print "(Error: $msg)\n";
-                exit;
+                next;
             }
             print $return. ".";
         }
@@ -602,7 +602,7 @@ sub insert_data {
             my ($return,$msg) = $new_entry->Create(%$item);
             unless ($return) {
                 print "(Error: $msg)\n";
-                exit;
+                next;
             }
             print $return. ".";
         }