This commit was generated by cvs2svn to compensate for changes in r3921,

[freeside.git] / rt / lib / RT.pm

diff --git a/rt/lib/RT.pm b/rt/lib/RT.pm
index 7e941a2..90c332b 100644 (file)
--- a/rt/lib/RT.pm
+++ b/rt/lib/RT.pm
@@ -47,7 +47,7 @@ use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger
         $MasonSessionDir
 );
 
-$VERSION = '3.0.9';
+$VERSION = '3.0.4';
 $CORE_CONFIG_FILE = "/opt/rt3/etc/RT_Config.pm";
 $SITE_CONFIG_FILE = "/opt/rt3/etc/RT_SiteConfig.pm";
 
@@ -117,10 +117,13 @@ sub LoadConfig {
 =cut
 
 sub Init {
-
+    require RT::Handle;
     #Get a database connection
-    ConnectToDatabase();
-
+        unless ($Handle && $Handle->dbh->ping) {
+    $Handle = RT::Handle->new();
+        } 
+    $Handle->Connect();
+    
     #RT's system user is a genuine database user. its id lives here
     $SystemUser = new RT::CurrentUser();
     $SystemUser->LoadByName('RT_System');
@@ -134,21 +137,6 @@ sub Init {
    InitLogging(); 
 }
 
-  
-=head2 ConnectToDatabase
-
-Get a database connection
-
-=cut
- 
-sub ConnectToDatabase {
-    require RT::Handle;
-    unless ($Handle && $Handle->dbh && $Handle->dbh->ping) {
-        $Handle = RT::Handle->new();
-    } 
-    $Handle->Connect();
-}
-    
 =head2 InitLogging
 
 Create the RT::Logger object. 
@@ -294,15 +282,8 @@ sub DropSetGIDPermissions {
 
 =head1 BUGS
 
-Please report them to rt-3.0-bugs@fsck.com, if you know what's broken and have at least some idea of what needs to be fixed.
-If you're not sure what's going on, report them rt-devel@lists.fsck.com.
-
 =head1 SEE ALSO
 
-L<RT::StyleGuide>
-L<DBIx::SearchBuilder>
-
-
 
 =begin testing