Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jozef Sroka
ISPConfig 3
Commits
8509f8ed
Commit
8509f8ed
authored
Sep 22, 2016
by
Till Brehm
Browse files
Corrected debug message in updater.
parent
2c75b730
Changes
1
Show whitespace changes
Inline
Side-by-side
install/lib/update.lib.php
View file @
8509f8ed
...
...
@@ -44,9 +44,9 @@ function prepareDBDump() {
//** load the pre update sql script do perform modifications on the database before the database is dumped
if
(
is_file
(
ISPC_INSTALL_ROOT
.
"/install/sql/pre_update.sql"
))
{
if
(
$conf
[
'mysql'
][
'admin_password'
]
==
''
)
{
caselog
(
"mysql --default-character-set="
.
escapeshellarg
(
$conf
[
'mysql'
][
'charset'
])
.
" -h "
.
escapeshellarg
(
$conf
[
'mysql'
][
'host'
])
.
" -u "
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_user'
])
.
" "
.
escapeshellarg
(
$conf
[
'mysql'
][
'database'
])
.
" < '"
.
ISPC_INSTALL_ROOT
.
"/install/sql/pre_update.sql' &> /dev/null"
,
__FILE__
,
__LINE__
,
'read in
ispconfig3
.sql'
,
'could not read in
ispconfig3
.sql'
);
caselog
(
"mysql --default-character-set="
.
escapeshellarg
(
$conf
[
'mysql'
][
'charset'
])
.
" -h "
.
escapeshellarg
(
$conf
[
'mysql'
][
'host'
])
.
" -u "
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_user'
])
.
" "
.
escapeshellarg
(
$conf
[
'mysql'
][
'database'
])
.
" < '"
.
ISPC_INSTALL_ROOT
.
"/install/sql/pre_update.sql' &> /dev/null"
,
__FILE__
,
__LINE__
,
'read in
pre_update
.sql'
,
'could not read in
pre_update
.sql'
);
}
else
{
caselog
(
"mysql --default-character-set="
.
escapeshellarg
(
$conf
[
'mysql'
][
'charset'
])
.
" -h "
.
escapeshellarg
(
$conf
[
'mysql'
][
'host'
])
.
" -u "
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_user'
])
.
" -p"
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_password'
])
.
" "
.
escapeshellarg
(
$conf
[
'mysql'
][
'database'
])
.
" < '"
.
ISPC_INSTALL_ROOT
.
"/install/sql/pre_update.sql' &> /dev/null"
,
__FILE__
,
__LINE__
,
'read in
ispconfig3
.sql'
,
'could not read in
ispconfig3
.sql'
);
caselog
(
"mysql --default-character-set="
.
escapeshellarg
(
$conf
[
'mysql'
][
'charset'
])
.
" -h "
.
escapeshellarg
(
$conf
[
'mysql'
][
'host'
])
.
" -u "
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_user'
])
.
" -p"
.
escapeshellarg
(
$conf
[
'mysql'
][
'admin_password'
])
.
" "
.
escapeshellarg
(
$conf
[
'mysql'
][
'database'
])
.
" < '"
.
ISPC_INSTALL_ROOT
.
"/install/sql/pre_update.sql' &> /dev/null"
,
__FILE__
,
__LINE__
,
'read in
pre_update
.sql'
,
'could not read in
pre_update
.sql'
);
}
}
...
...
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