diff options
author | ivan <ivan> | 2009-12-18 00:41:34 +0000 |
---|---|---|
committer | ivan <ivan> | 2009-12-18 00:41:34 +0000 |
commit | 40a7b3dc653e099f7bd0bd762b649b04c4432db2 (patch) | |
tree | f818105b1c8b13d709af4e251ee3213c5ba6773d /rt/html/autohandler | |
parent | 8d0665daac0c4deea67bf39bf4a13a9eaed51735 (diff) | |
parent | 2dfda73eeb3eae2d4f894099754794ef07d060dd (diff) |
This commit was generated by cvs2svn to compensate for changes in r8593,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'rt/html/autohandler')
-rw-r--r-- | rt/html/autohandler | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rt/html/autohandler b/rt/html/autohandler index 909b922c8..57ab22ade 100644 --- a/rt/html/autohandler +++ b/rt/html/autohandler @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# along with this program; if not, write to the Free Software %# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA %# 02110-1301 or visit their web page on the internet at -%# http://www.gnu.org/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -72,13 +72,13 @@ if ( $m->request_comp->attr_exists('AutoFlush') ) { ( !$type ) ? Encode::is_utf8($_) ? $_ - : Encode::decode( utf8 => $_, Encode::FB_PERLQQ ) + : Encode::decode( 'UTF-8' => $_, Encode::FB_PERLQQ ) : ( $type eq 'ARRAY' ) ? [ map { ( ref($_) or Encode::is_utf8($_) ) ? $_ - : Encode::decode( utf8 => $_, Encode::FB_PERLQQ ) + : Encode::decode( 'UTF-8' => $_, Encode::FB_PERLQQ ) } @$_ ] : ( $type eq 'HASH' ) @@ -86,7 +86,7 @@ if ( $m->request_comp->attr_exists('AutoFlush') ) { map { ( ref($_) or Encode::is_utf8($_) ) ? $_ - : Encode::decode( utf8 => $_, Encode::FB_PERLQQ ) + : Encode::decode( 'UTF-8' => $_, Encode::FB_PERLQQ ) } %$_ } : $_ @@ -280,7 +280,7 @@ if ( ( defined $session{'CurrentUser'} ) } # otherwise, drop the user at the SelfService default page - elsif ( $m->base_comp->path !~ '^(/+)SelfService/' ) { + elsif ( $m->base_comp->path !~ $RT::SelfServiceRegex ) { RT::Interface::Web::Redirect($RT::WebURL."SelfService/"); } else { |