Merge branch '4.0-trunk' into 4.2-trunk

Conflicts:
	lib/RT/StyleGuide.pod
  Tabs had been removed on the 4.2 side, as well as minor updates for
  moved elements and updated perl version.  These changes were merged
  into the more significant changes from 4.0-trunk.

	share/html/Search/Chart
	share/html/Search/Chart.html
	share/html/Search/Elements/Chart
  All of these fixed "bars" for the correct "bar" There were more
  occurrences of "bars" in 4.2, which were adjusted during the merge.

	t/api/date.t
  Trivial test count conflict.

	t/pod.t
  4.2 made the testfile mandatory, 4.0 made it test additional
  directories.

	t/web/path-traversal.t
  4.0 added new tests for allowing downloads of ".bashrc" files; the
  requested URL (with no matching attachment) returns a different error
  on 4.2 due to d9749a2, as ->Load now returns false in scalar context
  if the load failed.

docs/backups.pod

@@ -31,7 +31,7 @@ RT. :)
 
 =head3 MySQL
 
-    ( mysqldump rt4 --tables sessions --no-data; \
+    ( mysqldump rt4 --tables sessions --no-data --single-transaction; \
       mysqldump rt4 --ignore-table rt4.sessions --single-transaction ) \
         | gzip > rt-`date +%Y%m%d`.sql.gz
 

docs/extending/clickable_links.pod

@@ -95,6 +95,15 @@ subroutine B<must escape> HTML.
 A subroutine reference; modify it only if you have to. This can be used
 to add pre- or post-processing around all actions.
 
+=item cache
+
+An undefined variable that should be replaced with a subroutine
+reference. This subroutine will be called twice, once with the arguments
+fetch => content_ref and once with store => content_ref. In the fetch
+case, if a cached copy is found, return the cached content, otherwise
+return a false value. When passed store, you should populate your cache
+with the content. The return value is ignored in this case.
+
 =back
 
 =head2 Actions' arguments

etc/RT_Config.pm.in

@@ -322,8 +322,9 @@ Set(@LogToSyslogConf, ());
 =item C<$EmailSubjectTagRegex>
 
 This regexp controls what subject tags RT recognizes as its own.  If
-you're not dealing with historical C<$rtname> values, you'll likely
-never have to change this configuration.
+you're not dealing with historical C<$rtname> values, or historical
+queue-specific subject tags, you'll likely never have to change this
+configuration.
 
 Be B<very careful> with it. Note that it overrides C<$rtname> for
 subject token matching.

etc/upgrade/3.8.9/content

@@ -58,6 +58,7 @@ our @Initial = (
 s!(?<=Your ticket has been (?:approved|rejected) by { eval { )\$Approval->OwnerObj->Name!\$Approver->Name!
               )
             {
+                $template->SetType('Perl');
                 $template->SetContent($content);
             }
         }

lib/RT/Date.pm

@@ -551,7 +551,8 @@ Returns new unix time.
 
 sub AddDays {
     my $self = shift;
-    my $days = shift || 1;
+    my $days = shift;
+    $days = 1 unless defined $days;
     return $self->AddSeconds( $days * $DAY );
 }
 

lib/RT/Interface/REST.pm

@@ -328,7 +328,7 @@ sub process_attachments {
             Path => $tmp_fn,
             Type => $info->{'Content-Type'} || guess_media_type($tmp_fn),
             Filename => $file,
-            Disposition => "attachment",
+            Disposition => $info->{'Content-Disposition'} || "attachment",
         );
         $new_entity->bodyhandle->{'_dirty_hack_to_save_a_ref_tmp_fh'} = $tmp_fh;
         $i++;

lib/RT/Interface/Web/Handler.pm

@@ -288,7 +288,7 @@ sub PSGIApp {
         # CGI.pm normalizes .. out of paths so when you requested
         # /NoAuth/../Ticket/Display.html we saw Ticket/Display.html
         # PSGI doesn't normalize .. so we have to deal ourselves.
-        if ( $req->path_info =~ m{/\.} ) {
+        if ( $req->path_info =~ m{(^|/)\.\.?(/|$)} ) {
             $RT::Logger->crit("Invalid request for ".$req->path_info." aborting");
             my $res = Plack::Response->new(400);
             return $self->_psgi_response_cb($res->finalize,sub { $self->CleanupRequest });

lib/RT/Lifecycle.pm

@@ -337,7 +337,7 @@ sub IsActive {
     return 0;
 }
 
-=head3 inactive
+=head3 Inactive
 
 Returns an array of all inactive statuses for this lifecycle.
 
@@ -348,7 +348,7 @@ sub Inactive {
     return $self->Valid('inactive');
 }
 
-=head3 is_inactive
+=head3 IsInactive
 
 Takes a value and returns true if value is a valid inactive status.
 Otherwise, returns false.