[Rt-commit] [svn] r1777 - in rt/branches/3.3-TESTING: . bin
html/Elements html/Elements/CollectionAsTable lib lib/RT
autrijus at pallas.eruditorum.org
autrijus at pallas.eruditorum.org
Wed Nov 10 05:08:17 EST 2004
Author: autrijus
Date: Wed Nov 10 05:08:17 2004
New Revision: 1777
Modified:
rt/branches/3.3-TESTING/ (props changed)
rt/branches/3.3-TESTING/bin/standalone_httpd.in
rt/branches/3.3-TESTING/html/Elements/Callback
rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/ParseFormat
rt/branches/3.3-TESTING/html/Elements/Header
rt/branches/3.3-TESTING/html/Elements/TicketList
rt/branches/3.3-TESTING/html/Elements/TitleBoxStart
rt/branches/3.3-TESTING/lib/RT.pm.in
rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm
Log:
r3565 at not: autrijus | 2004-11-10T10:08:34.482570Z
* Various warning avoidance patches.
Modified: rt/branches/3.3-TESTING/bin/standalone_httpd.in
==============================================================================
--- rt/branches/3.3-TESTING/bin/standalone_httpd.in (original)
+++ rt/branches/3.3-TESTING/bin/standalone_httpd.in Wed Nov 10 05:08:17 2004
@@ -117,7 +117,7 @@
my ( $method, $request_uri, $proto, undef ) = split;
#$request_uri =~ s#\\#/#g;
- $RT::Logger->info("<- $peername: $_");
+ $RT::Logger->info("<- $peername: $_\n");
my ( $file, undef, $query_string ) =
( $request_uri =~ /([^?]*)(\?(.*))?/ ); # split at ?
#$file =~ s/%([\dA-Fa-f]{2})/chr(hex($1))/eg; # decode url-escaped entities
Modified: rt/branches/3.3-TESTING/html/Elements/Callback
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Callback (original)
+++ rt/branches/3.3-TESTING/html/Elements/Callback Wed Nov 10 05:08:17 2004
@@ -44,7 +44,8 @@
%#
%# END BPS TAGGED BLOCK }}}
<%once>
-my (%cache, $check);
+my %cache;
+my $check = '';
</%once>
<%init>
# checks for inode change time for each callback directory
Modified: rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/ParseFormat
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/ParseFormat (original)
+++ rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/ParseFormat Wed Nov 10 05:08:17 2004
@@ -48,17 +48,13 @@
</%ARGS>
<%init>
-use Regexp::Common qw(delimited);
+use Regexp::Common;
my @Columns;
-#my $quoted = qr[$RE{delimited}{-delim=>qq{\'\"}}|(?:\{|\}|\w|\.)+];
-my $justquoted = qr[$RE{delimited}{-delim=>qq{\'\"}}];
-#my $quoted = $RE{quoted}{-esc};
-my $word = qr [(?:\{|\}|\w|\.)+];
-while ($Format =~ /($justquoted|$word)/igx) {
+while ($Format =~ /($RE{delimited}{-delim=>qq{\'"}}|[{}\w.]+)/go) {
my $col = $1;
- if ($col =~ /^$RE{quoted}{-esc}$/) {
+ if ($col =~ /^$RE{quoted}$/o) {
substr($col,0,1) = "";
substr($col,-1,1) = "";
}
Modified: rt/branches/3.3-TESTING/html/Elements/Header
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Header (original)
+++ rt/branches/3.3-TESTING/html/Elements/Header Wed Nov 10 05:08:17 2004
@@ -47,7 +47,7 @@
<HTML>
<HEAD>
<TITLE><%$Title%></TITLE>
-% if ($Refresh > 0) {
+% if ($Refresh) {
<META HTTP-EQUIV="REFRESH" CONTENT="<%$Refresh%>">
% }
@@ -88,7 +88,7 @@
% }
<& /Elements/Callback, %ARGS &>
% unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
-| <A HREF="<%$RT::WebPath%>/NoAuth/Logout.html<%$URL && "?URL=".$URL%>"><&|/l&>Logout</&></a>
+| <A HREF="<%$RT::WebPath%>/NoAuth/Logout.html<%$URL ? "?URL=".$URL : ''%>"><&|/l&>Logout</&></a>
% }
<BR>
<&|/l, "<b>".$session{'CurrentUser'}->Name."</b>" &>Logged in as [_1]</&>
Modified: rt/branches/3.3-TESTING/html/Elements/TicketList
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/TicketList (original)
+++ rt/branches/3.3-TESTING/html/Elements/TicketList Wed Nov 10 05:08:17 2004
@@ -100,7 +100,7 @@
% }
% }
<%INIT>
-my $maxitems;
+my $maxitems = 0;
$Format ||= $RT::DefaultSearchResultFormat;
# Scrub the html of the format string to remove any potential nasties.
Modified: rt/branches/3.3-TESTING/html/Elements/TitleBoxStart
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/TitleBoxStart (original)
+++ rt/branches/3.3-TESTING/html/Elements/TitleBoxStart Wed Nov 10 05:08:17 2004
@@ -74,7 +74,7 @@
$bodyclass => undef
$title_href => undef
$title => undef
-$title_class => undef
+$title_class => ''
$titleright_href => undef
$titleright => undef
Modified: rt/branches/3.3-TESTING/lib/RT.pm.in
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT.pm.in (original)
+++ rt/branches/3.3-TESTING/lib/RT.pm.in Wed Nov 10 05:08:17 2004
@@ -265,7 +265,12 @@
## Mason). It will log all problems through the standard logging
## mechanism (see above).
-$SIG{__WARN__} = sub {$RT::Logger->warning($_[0])};
+$SIG{__WARN__} = sub {
+ # The 'wide character' warnings has to be silenced for now, at least
+ # until HTML::Mason offers a sane way to process both raw output and
+ # unicode strings.
+ $RT::Logger->warning($_[0]) if index($_[0], 'Wide character in ') != 0;
+};
#When we call die, trap it and log->crit with the value of the die.
Modified: rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm (original)
+++ rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm Wed Nov 10 05:08:17 2004
@@ -366,7 +366,7 @@
if ( ( !defined $self->{'LangHandle'} )
|| ( !UNIVERSAL::can( $self->{'LangHandle'}, 'maketext' ) )
|| (@_) ) {
- if ( (!$RT::SystemUser || $self->id == $RT::SystemUser->id() )) {
+ if ( !$RT::SystemUser or ($self->id || 0) == $RT::SystemUser->id() ) {
@_ = qw(en-US);
}
More information about the Rt-commit
mailing list