Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
9de7288e
Commit
9de7288e
authored
Oct 12, 2006
by
Penny Leach
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check for load_config better so it doesn't throw exceptions when we're
already in the installer
parent
d5f5dde3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
htdocs/init.php
htdocs/init.php
+9
-2
No files found.
htdocs/init.php
View file @
9de7288e
...
...
@@ -68,6 +68,7 @@ if (!isset($CFG->wwwroot)) {
// core libraries
require
(
'mahara.php'
);
require
(
'dml.php'
);
require
(
'ddl.php'
);
require
(
'constants.php'
);
require
(
'web.php'
);
require
(
'session.php'
);
...
...
@@ -108,8 +109,14 @@ catch (Exception $e) {
// nice message should be displayed explaining the problem etc. etc.
throw
new
Exception
(
$errormessage
);
}
load_config
();
try
{
load_config
();
}
catch
(
DatalibException
$e
)
{
if
(
!
defined
(
'INSTALLER'
))
{
throw
$e
;
}
}
if
(
!
get_config
(
'theme'
))
{
// if it's not set, we're probably not installed,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment