[Rt-commit] r14850 - in rt/3.8/branches/3.8.1-releng: . lib/RT

[falcone at bestpractical.com]

Author: falcone
Date: Wed Aug  6 09:51:21 2008
New Revision: 14850

Modified:
   rt/3.8/branches/3.8.1-releng/   (props changed)
   rt/3.8/branches/3.8.1-releng/lib/RT/Ticket_Overlay.pm
   rt/3.8/branches/3.8.1-releng/share/html/NoAuth/RichText/FCKeditor/fckconfig.js

Log:
- Merge //mirror/bps-public/rt/3.8/trunk to //mirror/bps-public/rt/3.8/branches/3.8.1-releng

Modified: rt/3.8/branches/3.8.1-releng/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/3.8/branches/3.8.1-releng/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/3.8/branches/3.8.1-releng/lib/RT/Ticket_Overlay.pm	Wed Aug  6 09:51:21 2008
@@ -430,7 +430,7 @@
             if ( $watcher =~ /^\d+$/ ) {
                 push @{ $args{$type} }, $watcher;
             } else {
-                my @addresses = Email::Address->parse( $watcher );
+                my @addresses = RT::EmailParser->ParseEmailAddress( $watcher );
                 foreach my $address( @addresses ) {
                     my $user = RT::User->new( $RT::SystemUser );
                     my ($uid, $msg) = $user->LoadOrCreateByEmail( $address );

Modified: rt/3.8/branches/3.8.1-releng/share/html/NoAuth/RichText/FCKeditor/fckconfig.js
==============================================================================
--- rt/3.8/branches/3.8.1-releng/share/html/NoAuth/RichText/FCKeditor/fckconfig.js	(original)
+++ rt/3.8/branches/3.8.1-releng/share/html/NoAuth/RichText/FCKeditor/fckconfig.js	Wed Aug  6 09:51:21 2008
@@ -94,7 +94,8 @@
 FCKConfig.ToolbarLocation = 'In' ;
 
 FCKConfig.ToolbarSets["Default"] = [
-	['Source','DocProps','-','Save','NewPage','Preview'], // ,'-','Templates'],
+	//['Source','DocProps','-','Save','NewPage','Preview'], // ,'-','Templates'],
+	['Source','DocProps','-','Preview'], // ,'-','Templates'],
 	['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
 	['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
 //	['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],