Cleaned up the message stanza display. (Should display again without RTIR installed); bumped to 2.1.83rt-2.1.83

5 files changed, 14 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 26a2dbd712..1717d819e5 100755
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ SITE_CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
 
 RT_VERSION_MAJOR	=	2
 RT_VERSION_MINOR	=	1
-RT_VERSION_PATCH	=	82
+RT_VERSION_PATCH	=	83
 
 RT_VERSION =	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
 TAG 	   =	rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
diff --git a/configure b/configure
index d420223383..608e8c645b 100644
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 1.1 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.54 for RT 2.1.82.
+# Generated by GNU Autoconf 2.54 for RT 2.1.83.
 #
 # Report bugs to <rt-3.0-bugs@fsck.com>.
 #
@@ -266,8 +266,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='RT'
 PACKAGE_TARNAME='rt'
-PACKAGE_VERSION='2.1.82'
-PACKAGE_STRING='RT 2.1.82'
+PACKAGE_VERSION='2.1.83'
+PACKAGE_STRING='RT 2.1.83'
 PACKAGE_BUGREPORT='rt-3.0-bugs@fsck.com'
 
 ac_unique_file="lib/RT.pm.in"
@@ -725,7 +725,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures RT 2.1.82 to adapt to many kinds of systems.
+\`configure' configures RT 2.1.83 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -782,7 +782,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RT 2.1.82:";;
+     short | recursive ) echo "Configuration of RT 2.1.83:";;
    esac
   cat <<\_ACEOF
 
@@ -883,7 +883,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-RT configure 2.1.82
+RT configure 2.1.83
 generated by GNU Autoconf 2.54
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -898,7 +898,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by RT $as_me 2.1.82, which was
+It was created by RT $as_me 2.1.83, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   $ $0 $@
@@ -1210,7 +1210,7 @@ rt_version_major=2
 
 rt_version_minor=1
 
-rt_version_patch=82
+rt_version_patch=83
 
 test "x$rt_version_major" = 'x' && rt_version_major=0
 test "x$rt_version_minor" = 'x' && rt_version_minor=0
@@ -2245,7 +2245,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by RT $as_me 2.1.82, which was
+This file was extended by RT $as_me 2.1.83, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2299,7 +2299,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RT config.status 2.1.82
+RT config.status 2.1.83
 configured by $0, generated by GNU Autoconf 2.54,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 64454afa62..0bd7b607f6 100755
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_REVISION($Revision: 1.1 $)dnl
 
 dnl Setup autoconf
 AC_PREREQ(2.53)
-AC_INIT(RT, [2.1.82], [rt-3.0-bugs@fsck.com])
+AC_INIT(RT, [2.1.83], [rt-3.0-bugs@fsck.com])
 AC_CONFIG_SRCDIR([lib/RT.pm.in])
 
 dnl Extract RT version number components
diff --git a/html/Ticket/Elements/ShowMessageStanza b/html/Ticket/Elements/ShowMessageStanza
index 749506a2dd..eb5afd6df4 100755
--- a/html/Ticket/Elements/ShowMessageStanza
+++ b/html/Ticket/Elements/ShowMessageStanza
@@ -32,7 +32,7 @@ foreach my $stanza (@$Message) {
     elsif ( ref $stanza eq "HASH" ) {
         my $content = $stanza->{raw};
         RT::Interface::Web::EscapeUTF8(\$content);
-        $content =  $m->scomp('/Elements/Callback', content => $content, %ARGS);
+        $m->comp('/Elements/Callback', content => \$content, %ARGS);
                 $content =~ s/\n/<br>/gi;
 
 </%perl>
diff --git a/lib/RT.pm.in b/lib/RT.pm.in
index ef1c67c3b3..691dc4a2cd 100755
--- a/lib/RT.pm.in
+++ b/lib/RT.pm.in
@@ -100,6 +100,7 @@ After that, go after the site config.
 =cut
 
 sub LoadConfig {
+     local *Set = sub { $_[0] = $_[1] unless defined $_[0] }; 
     if ( -f "$SITE_CONFIG_FILE" ) {
         require $SITE_CONFIG_FILE
           || die ("Couldn't load RT config file  '$SITE_CONFIG_FILE'\n$@");