[Rt-commit] r4963 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Tue Apr  4 13:54:49 2006
New Revision: 4963

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox
   rt/branches/3.7-EXPERIMENTAL/html/Elements/SetupSessionCookie

Log:
 r2304 at cubic-pc:  cubic | 2006-04-04 21:18:35 +0400
 * drop unint warnings


Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox	Tue Apr  4 13:54:49 2006
@@ -43,19 +43,19 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<textarea class="messagebox" cols="<% $Width %>" rows="<% $Height %>" wrap="<% $Wrap %>" name="<% $Name %>"><& /Elements/Callback, %ARGS &><% $Default %><% $message %><% $signature %></textarea>
+<textarea class="messagebox" cols="<% $Width %>" rows="<% $Height %>" wrap="<% $Wrap %>" name="<% $Name %>"><& /Elements/Callback, %ARGS &><% $Default || '' %><% $message %><% $signature %></textarea>
 <%INIT>
 
 my $message = '';
 
-if ($QuoteTransaction) {
-    my $transaction=RT::Transaction->new($session{'CurrentUser'});
-    $transaction->Load($QuoteTransaction);
-    $message=$transaction->Content(Quote => 1);
+if ( $QuoteTransaction ) {
+    my $transaction = RT::Transaction->new( $session{'CurrentUser'} );
+    $transaction->Load( $QuoteTransaction );
+    $message = $transaction->Content( Quote => 1 );
 }
 
 my $signature = '';
-if ($IncludeSignature and my $text = $session{'CurrentUser'}->UserObj->Signature) {
+if ( $IncludeSignature and my $text = $session{'CurrentUser'}->UserObj->Signature ) {
 	$signature = "-- \n". $text;
 }
 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/SetupSessionCookie
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/SetupSessionCookie	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/SetupSessionCookie	Tue Apr  4 13:54:49 2006
@@ -54,7 +54,7 @@
 $SessionCookie ||= ( $cookies{$cookiename} ? $cookies{$cookiename}->value : undef ),
 
 tie %session, 'RT::Interface::Web::Session', $SessionCookie;
-undef $cookies{$cookiename} unless $session{'_session_id'} eq $SessionCookie;
+undef $cookies{$cookiename} unless $SessionCookie && $session{'_session_id'} eq $SessionCookie;
 
 if ( int RT->Config->Get('AutoLogoff') ) {
     my $now = int(time/60);