[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.0rc2-10-g181d165

[Shawn Moore]

The branch, 4.4-trunk has been updated
       via  181d1659bc8e4103942ee787127922486f66b4c1 (commit)
       via  e0a69398f6ede80c7e0cff1f8a97feca514fac3c (commit)
       via  ff02eb09e1ded53fd8f1984ea852f131a4517c48 (commit)
      from  64e07c406a227b43d0c023c8a87402ac010526c8 (commit)

Summary of changes:
 lib/RT/Template.pm        | 13 +++++++++++++
 sbin/rt-setup-database.in |  2 --
 2 files changed, 13 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 181d1659bc8e4103942ee787127922486f66b4c1
Merge: 64e07c4 e0a6939
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri Dec 4 11:27:17 2015 -0500

    Merge branch '4.4/escape-functions-in-templates' into 4.4-trunk

diff --cc sbin/rt-setup-database.in
index d8e4fb2,1ec3c4a..d352143
--- a/sbin/rt-setup-database.in
+++ b/sbin/rt-setup-database.in
@@@ -353,10 -353,7 +353,8 @@@ sub action_insert 
      my %args = @_;
      unless ($RAN_INIT) {
          $RT::Handle = RT::Handle->new;
- 
 -        my $has_custom_roles = grep { lc($_) eq 'customroles' } $RT::Handle->_TableNames(get_admin_dbh());
 +        my $dbh = get_admin_dbh();
 +        my $has_custom_roles = grep { lc($_) eq 'customroles' } $RT::Handle->_TableNames($dbh);
- 
          RT::Init(SkipCustomRoles => !$has_custom_roles);
          $RAN_INIT++;
      }

-----------------------------------------------------------------------