[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-880-g8976c53

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  8976c535a0ff0aa5fc9870c1b7061a3a5f45b3fb (commit)
       via  8f5915a619c56402610063d11a95b7df26d682b6 (commit)
      from  714b08cd6f0edfad3e7e4a2d8da505093b691e41 (commit)

Summary of changes:
 bin/standalone_httpd.in |   18 ++++--------------
 lib/RT/I18N.pm          |    4 ++--
 2 files changed, 6 insertions(+), 16 deletions(-)

- Log -----------------------------------------------------------------
commit 8f5915a619c56402610063d11a95b7df26d682b6
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Sep 27 12:15:35 2010 -0400

    minor stylistic cleanups to RT::I18N

diff --git a/lib/RT/I18N.pm b/lib/RT/I18N.pm
index 8aa468f..e656994 100755
--- a/lib/RT/I18N.pm
+++ b/lib/RT/I18N.pm
@@ -59,11 +59,12 @@ use warnings;
 
 use Locale::Maketext 1.04;
 use Locale::Maketext::Lexicon 0.25;
-use base ('Locale::Maketext::Fuzzy');
+use base 'Locale::Maketext::Fuzzy';
 
 use Encode;
 use MIME::Entity;
 use MIME::Head;
+use File::Glob;
 
 # I decree that this project's first language is English.
 
@@ -91,7 +92,6 @@ Initializes the lexicons used for localization.
 =cut
 
 sub Init {
-    require File::Glob;
 
     my @lang = RT->Config->Get('LexiconLanguages');
     @lang = ('*') unless @lang;

commit 8976c535a0ff0aa5fc9870c1b7061a3a5f45b3fb
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Sep 27 15:24:24 2010 -0400

    standalone_httpd had a full, incorrect clone of RT->Init() that had
    drifted from the current version of RT->Init();

diff --git a/bin/standalone_httpd.in b/bin/standalone_httpd.in
index 2c90fd0..ed33b44 100755
--- a/bin/standalone_httpd.in
+++ b/bin/standalone_httpd.in
@@ -87,11 +87,6 @@ if ( $opt{help} ) {
 
 require RT;
 RT->LoadConfig();
-RT->InitLogging();
-if (RT->Config->Get('DevelMode')) { require Module::Refresh; }
-
-RT::CheckPerlRequirements();
-RT->InitPluginPaths();
 
 my $explicit_port = shift @ARGV;
 my $port = $explicit_port || RT->Config->Get('WebPort') || '8080';
@@ -129,15 +124,10 @@ EOF
 
     RT->InstallMode(1);
 } else {
-    RT->ConnectToDatabase();
-    RT->InitSystemObjects();
-    RT->InitClasses( Heavy => 1 );
-    RT->InitPlugins();
-    RT->Config->PostLoadCheck();
-
-    my ($status, $msg) = RT::Handle->CheckCompatibility(
-        $RT::Handle->dbh, 'post'
-    );
+    RT->Init();
+    if (RT->Config->Get('DevelMode')) { require Module::Refresh; }
+
+    my ($status, $msg) = RT::Handle->CheckCompatibility( $RT::Handle->dbh, 'post');
     unless ( $status ) {
         print STDERR $msg, "\n\n";
         exit -1;

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