Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'Item14180' into Release02x01
  • Loading branch information
gac410 committed Nov 1, 2016
2 parents 9e6a267 + c6bd9e6 commit 40f745e
Show file tree
Hide file tree
Showing 6 changed files with 685 additions and 554 deletions.
6 changes: 4 additions & 2 deletions core/lib/Foswiki.pm
Expand Up @@ -362,7 +362,8 @@ BEGIN {
$Foswiki::cfg{isVALID} = 1;
}
else {
$bootstrap_message = Foswiki::Configure::Load::bootstrapConfig();
require Foswiki::Configure::Bootstrap;
$bootstrap_message = Foswiki::Configure::Bootstrap::bootstrapConfig();
eval 'require Foswiki::Plugins::ConfigurePlugin';
die
"LocalSite.cfg load failed, and ConfigurePlugin could not be loaded: $@"
Expand Down Expand Up @@ -2073,7 +2074,8 @@ sub new {
# has been parsed.
if ( $Foswiki::cfg{isBOOTSTRAPPING} ) {
my $phase2_message =
Foswiki::Configure::Load::bootstrapWebSettings( $query->action() );
Foswiki::Configure::Bootstrap::bootstrapWebSettings(
$query->action() );
unless ($system_message) { # Don't do this more than once.
$system_message =
( $Foswiki::cfg{Engine} && $Foswiki::cfg{Engine} !~ /CLI/i )
Expand Down

0 comments on commit 40f745e

Please sign in to comment.