[Rt-commit] rt branch, master, updated. rt-4.1.5-152-g74f299e

[Alex Vandiver]

The branch, master has been updated
       via  74f299e2a1286fb8147cfb6b57f34b03c9bb26bc (commit)
       via  6cc219c1321dc55e0e91c92b4851037e87dfbc36 (commit)
       via  c9b8542e85df0365b284c94b2616b9362731fe24 (commit)
       via  3c6af070008c4153b47f3a4fd0afd35c00352a65 (commit)
      from  baa627fe28da8af657db569b41a6dad5684ca03c (commit)

Summary of changes:
 docs/UPGRADING-4.2  |  9 +++++++++
 etc/RT_Config.pm.in | 26 ++++++++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 74f299e2a1286fb8147cfb6b57f34b03c9bb26bc
Merge: baa627f 6cc219c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Dec 26 23:04:42 2012 -0500

    Merge branch '4.2/new-default-options'
    
    Conflicts:
    	docs/UPGRADING-4.2

diff --cc docs/UPGRADING-4.2
index 77fe86a,43317d5..52be27e
--- a/docs/UPGRADING-4.2
+++ b/docs/UPGRADING-4.2
@@@ -11,34 -5,11 +11,43 @@@ UPGRADING FROM RT 4.0.0 and greate
    but an informational notice will be issued on server start telling you about
    the rename.  To avoid this you should set $LogToSTDERR instead.
  
 +* The link direction and type maps are consolidated into RT::Link.  If you
 +  wrote local customizations or extensions utilizing %RT::Ticket::LINKDIRMAP,
 +  %RT::Ticket::LINKTYPEMAP, RT::Ticket->LINKDIRMAP, RT::Ticket->LINKTYPEMAP, or
 +  %RT::Record::LINKDIRMAP, you will need to switch to %RT::Link::DIRMAP and
 +  %RT::Link::TYPEMAP.
 +
 +* $LinkTransactionsRun1Scrip is removed.  If you were relying on this behaviour
 +  (by setting it to 1), you should adjust your scrips to ignore one of the link
 +  transactions.
 +
 +* The $AttachmentUnits option was removed in preference of always displaying in
 +  megabytes, kilobytes, or bytes as appropriate.  The option was incompletely
 +  implemented and controlled display in the attachments list but not history.
 +
 +* MakeClicky handlers added via a callback are now passed an "object" key in
 +  the parameter hash instead of "ticket".  The object may be any RT::Record
 +  subclass.
 +
 +* $MessageBoxWrap was removed.  Wrapping is now always SOFT.  If you want hard
 +  line breaks, enter them manually.
 +
 +* ShowUser handlers (/Elements/ShowUser*) have moved out of Mason components
 +  and into RT::User methods.  Any custom username formats will need to be
 +  reimplemented as RT::User methods.  Renaming should follow that of the core
 +  components:
 +
 +        /Elements/ShowUserConcise => RT::User->_FormatUserConcise
 +        /Elements/ShowUserVerbose => RT::User->_FormatUserVerbose
 +
 +  The _FormatUser* methods are passed a hash containing the keys User and
 +  Address, which have the same properties as before.
++
+ * Rich text (HTML) messages are now preferred for display.  If you prefer plain
+   text messages, set $PreferRichText to 0.
+ 
+ * User email addresses are now validated by default and multiple,
+   comma-separated addresses for a single user are no longer allowed.  Existing
+   users with invalid addresses will continue to work until the next time they
+   are updated by an administrator on the modify user page.  If you prefer no
+   address validation, set $ValidateUserEmailAddresses to 0.
diff --cc etc/RT_Config.pm.in
index e78786f,c05bc60..fb219ac
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@@ -1589,12 -1547,24 +1592,12 @@@ overrides C<TrustHTMLAttachments>
  
  Set($AlwaysDownloadAttachments, undef);
  
 -=item C<$AttachmentUnits>
 -
 -Controls the units (kilobytes or bytes) that attachment sizes use for
 -display. The default is to display kilobytes if the attachment is
 -larger than 1024 bytes, bytes otherwise. If you set
 -C<$AttachmentUnits> to C<'k'> then attachment sizes will always be
 -displayed in kilobytes. If set to C<'b'>, then sizes will be bytes.
 -
 -=cut
 -
 -Set($AttachmentUnits, undef);
 -
  =item C<$PreferRichText>
  
- If C<$PreferRichText> is set to 1, RT will show HTML/Rich text messages
- in preference to their plain-text alternatives. RT "scrubs" the HTML to
- show only a minimal subset of HTML to avoid possible contamination by
- cross-site-scripting attacks.
+ By default, RT shows rich text (HTML) messages if possible.
+ 
+ If C<$PreferRichText> is set to 0, RT will show plain text messages
+ in preference to any rich text alternatives.
  
  =cut
  

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