[Rt-commit] r19612 - in rt/3.999/trunk: lib lib/RT/Action share/html/Install t t/web
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Sun May 10 05:50:47 EDT 2009
Author: sunnavy
Date: Sun May 10 05:50:47 2009
New Revision: 19612
Removed:
rt/3.999/trunk/lib/RT/Action/Install.pm
rt/3.999/trunk/lib/RT/Installer.pm
rt/3.999/trunk/share/html/Install/
rt/3.999/trunk/t/00-action-Install.t
Modified:
rt/3.999/trunk/lib/RT.pm
rt/3.999/trunk/lib/RT/Dispatcher.pm
rt/3.999/trunk/t/00-compile.t
rt/3.999/trunk/t/web/compilation_errors.t
Log:
remove obsolete Install related stuff
Modified: rt/3.999/trunk/lib/RT.pm
==============================================================================
--- rt/3.999/trunk/lib/RT.pm (original)
+++ rt/3.999/trunk/lib/RT.pm Sun May 10 05:50:47 2009
@@ -57,7 +57,7 @@
use strict;
use warnings;
use File::Spec ();
-use vars qw($Config $System $nobody $Handle $_install_mode);
+use vars qw($Config $System $nobody $Handle );
our $VERSION = '3.999.0';
our $BASE_PATH = Jifty::Util->app_root;
@@ -333,14 +333,6 @@
return @plugins;
}
-sub install_mode {
- my $self = shift;
- if (@_) {
- $_install_mode = shift;
- }
- return $_install_mode;
-}
-
=head2 init_jifty
call Jifty->new to init Jifty's stuff.
Modified: rt/3.999/trunk/lib/RT/Dispatcher.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Dispatcher.pm (original)
+++ rt/3.999/trunk/lib/RT/Dispatcher.pm Sun May 10 05:50:47 2009
@@ -63,19 +63,6 @@
};
before qr/.*/ => run {
- if ( RT->install_mode ) {
- my $path = Jifty->web->request->path;
- if ( $path !~ RT->config->get('web_no_auth_regex')
- && $path !~ m{^(/+)Install/} && $path !~ m{^/+log(in|out)} )
- {
- Jifty->web->redirect(
- RT->config->get('web_path') . "Install/index.html"
- );
- }
- }
-}
-
-before qr/.*/ => run {
if ( int RT->config->get('auto_logoff') ) {
my $now = int( time / 60 );
Modified: rt/3.999/trunk/t/00-compile.t
==============================================================================
--- rt/3.999/trunk/t/00-compile.t (original)
+++ rt/3.999/trunk/t/00-compile.t Sun May 10 05:50:47 2009
@@ -2,7 +2,7 @@
use strict;
use warnings;
use RT::Test;
-use Test::More tests => 32;
+use Test::More tests => 31;
require_ok("RT");
require_ok("RT::Test");
@@ -34,7 +34,6 @@
require_ok("RT::Interface::Web");
require_ok("RT::SavedSearch");
require_ok("RT::SavedSearches");
-require_ok("RT::Installer");
require_ok("RT::Util");
Modified: rt/3.999/trunk/t/web/compilation_errors.t
==============================================================================
--- rt/3.999/trunk/t/web/compilation_errors.t (original)
+++ rt/3.999/trunk/t/web/compilation_errors.t Sun May 10 05:50:47 2009
@@ -5,7 +5,6 @@
use Test::More;
my $tests = 2;
find ( sub { wanted() and $tests += 4 } , 'share/html/');
-find ( sub { /\.html$/ and $tests += 4 } , 'share/html/Install');
plan tests => $tests;
use HTTP::Request::Common;
use HTTP::Cookies;
@@ -31,14 +30,10 @@
use File::Find;
-# we take out pages below Install/ because those pages will set install_mode,
-# which will redirect any page out Install/ to Install/index.html
find ( sub { wanted() and test_get($File::Find::name) } , 'share/html');
-find ( sub { /\.html$/ and test_get($File::Find::name) } , 'share/html/Install');
sub wanted {
- -f && /\.html$/ && $_ !~ /Logout.html$/ && $File::Find::name !~
- m{share/html/Install/};
+ -f && /\.html$/ && $_ !~ /Logout.html$/;
}
sub test_get {
More information about the Rt-commit
mailing list