[Rt-commit] rt branch, master, updated. rt-4.1.17-169-g154b241

Alex Vandiver alexmv at bestpractical.com
Mon Jul 29 17:16:01 EDT 2013


The branch, master has been updated
       via  154b2416c8afe495f65e04cfda408ee67c95c869 (commit)
       via  04570ff80417f4c5794778e9ed9ce4c3d6221d48 (commit)
       via  93f962eb0ab1bc72e129b3bacc81350bcff28f66 (commit)
       via  8acb3b744ac2ecdb0b40d20b5663fb306da6eb6a (commit)
       via  061bac08b798bb6653986b017450006424cab89f (commit)
       via  d4a9ed67e4b30fcee8bd9ab2d65ee207da4189aa (commit)
       via  40ef24410a5b59e9bb6bddcaf7030be8250a3172 (commit)
       via  3399f2b4aaf9010ebcdc8dad0699e965cc5bf907 (commit)
       via  9d271309486eae852449fbf012906eb36d0f361f (commit)
       via  06dc0604f3acfcea67aee2df0f390bdc7124039f (commit)
       via  d1a41baeaa89dedeff90ac8f5df9ded936c8624c (commit)
       via  8d2f12c3459be710c253e379e3078c462290b996 (commit)
       via  d1636843938fa7e50e8dea2f35a3a268564ca7d8 (commit)
       via  2f21ca104b9f57940fe0e6a38b60dc6fd0f82f1b (commit)
       via  317565e706e0a78007ddb7b98895210ac3a490a9 (commit)
       via  fbed46142611b11795a02fff1bd13dc049db8c5d (commit)
       via  4a9f5c227db8c8765daa6c98bb888858bed564d1 (commit)
       via  a15f023fb6dd30779f3e68f1814c300f13179b87 (commit)
       via  f1afa1541fa25caa53a1353f828a03c84124c5da (commit)
       via  fbc0f1ac246c109cb3ed08e0ca82ac8d3285a4a9 (commit)
       via  001b1c917dc7fc1e3b0539cf15b908c2642cdc11 (commit)
       via  d20710945e32e8901a597b1909f365314c419483 (commit)
       via  71e589b033c17419a18727104257e2a20626bb89 (commit)
       via  74d73837f3089f58bfa39dc67f5a5c9c995f0d06 (commit)
      from  99b923c8ad335693c1643d0bfa7e1c37acf85bb4 (commit)

Summary of changes:
 .../tools/rt-parse-mail-log                        | 52 +++++++++++-----------
 devel/tools/rt-static-docs                         |  6 ++-
 lib/RT.pm                                          |  6 +--
 lib/RT/Tickets.pm                                  |  2 +-
 sbin/rt-email-group-admin.in                       | 24 +++++++---
 sbin/rt-shredder.in                                |  6 ++-
 share/html/Approvals/index.html                    |  7 +++
 share/html/Dashboards/Render.html                  | 10 +++--
 t/99-policy.t                                      | 24 +++++-----
 t/mail/mime_decoding.t                             |  7 +++
 10 files changed, 91 insertions(+), 53 deletions(-)
 copy lib/RT/Action/SetPriority.pm => devel/tools/rt-parse-mail-log (78%)
 mode change 100644 => 100755

- Log -----------------------------------------------------------------
commit 154b2416c8afe495f65e04cfda408ee67c95c869
Merge: 99b923c 04570ff
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Jul 29 17:09:30 2013 -0400

    Merge branch '4.0-trunk'
    
    Conflicts:
    	lib/RT/I18N.pm
    	t/mail/mime_decoding.t

diff --cc lib/RT/Tickets.pm
index bd943c9,f4cc7a5..4928475
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@@ -2194,10 -2887,10 +2194,10 @@@ sub LimitCustomField 
      @rest = ( ENTRYAGGREGATOR => 'AND' )
          if ( $CF->Type eq 'SelectMultiple' );
  
 -    $self->Limit(
 +    $self->LimitField(
          VALUE => $args{VALUE},
          FIELD => "CF"
-             .(defined $args{'QUEUE'}? ".{$args{'QUEUE'}}" : '' )
+             .(defined $args{'QUEUE'}? ".$args{'QUEUE'}" : '' )
              .".{" . $CF->Name . "}",
          OPERATOR    => $args{OPERATOR},
          CUSTOMFIELD => 1,
diff --cc share/html/Approvals/index.html
index 14d430a,1963cb6..9afd967
--- a/share/html/Approvals/index.html
+++ b/share/html/Approvals/index.html
@@@ -64,11 -64,18 +64,18 @@@ foreach my $arg ( keys %ARGS ) 
  
      my $ticket = LoadTicket($1);
  
+     my $skip_update = 0;
+     $m->callback( CallbackName => 'BeforeApproval',
+                   skip_update => \$skip_update,
+                   Ticket  => $ticket,
+                   actions => \@actions);
+     next if $skip_update;
+ 
      if ( $ARGS{ "Approval-" . $ticket->Id . "-Notes" } ) {
          my $notes = MIME::Entity->build(
 -	    Data => [ $ARGS{ "Approval-" . $ticket->Id . "-Notes" } ]
 -	);
 -	RT::I18N::SetMIMEEntityToUTF8($notes); # convert text parts into utf-8
 +            Data => [ $ARGS{ "Approval-" . $ticket->Id . "-Notes" } ]
 +        );
 +        RT::I18N::SetMIMEEntityToUTF8($notes); # convert text parts into utf-8
  
          my ( $notesval, $notesmsg ) = $ticket->Correspond( MIMEObj => $notes );
          if ($notesval) {
diff --cc t/mail/mime_decoding.t
index 87c2141,fbf8849..1126f1f
--- a/t/mail/mime_decoding.t
+++ b/t/mail/mime_decoding.t
@@@ -57,6 -34,16 +57,13 @@@ diag q{'=' char in a trailing part afte
      );
  }
  
+ diag q{adding quotes around mime words containing specials when word is already quoted};
+ {
 -    my $str = <<"END";
 -Content-Disposition: attachment; filename="=?iso-8859-1?Q?foobar,_?=
 - =?iso-8859-1?Q?barfoo.docx?="
 -END
 -    my $decoded = 'Content-Disposition: attachment; filename="foobar, barfoo.docx"';
 -    is( RT::I18N::DecodeMIMEWordsToUTF8($str), $decoded, "No added quotes" );
++    my $str = 'attachment; filename="=?iso-8859-1?Q?foobar,_?=' . "\n" . '=?iso-8859-1?Q?barfoo.docx?="';
++    my $decoded = 'attachment; filename="foobar, barfoo.docx"';
++    is( RT::I18N::DecodeMIMEWordsToUTF8($str, 'content-disposition'), $decoded, "No added quotes" );
+ }
+ 
  diag q{regression test for #5248 from rt3.fsck.com};
  {
      my $str = qq{Subject: =?ISO-8859-1?Q?Re=3A_=5BXXXXXX=23269=5D_=5BComment=5D_Frag?=}

-----------------------------------------------------------------------


More information about the Rt-commit mailing list