Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
8afae70e
Commit
8afae70e
authored
Nov 07, 2014
by
Aaron Wells
Browse files
Upgrader always thinks it needs to upgrade core
Bug 1390318 Change-Id: I214a62d9bb4b40e6c8ebbde199177905608e34de
parent
b4812741
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/upgrade.php
View file @
8afae70e
...
...
@@ -62,6 +62,7 @@ function check_upgrades($name=null) {
$core
->
to
=
$config
->
version
;
$core
->
torelease
=
$config
->
release
;
$core
->
toseries
=
$config
->
series
;
$toupgrade
[
'core'
]
=
$core
;
if
(
empty
(
$coreversion
))
{
if
(
is_mysql
())
{
// Show a more informative error message if using mysql with skip-innodb
// In MySQL 5.6.x, we run the command 'SHOW ENGINES' to check if InnoDB is enabled or not
...
...
@@ -95,7 +96,10 @@ function check_upgrades($name=null) {
$core
->
from
=
$coreversion
;
$core
->
fromrelease
=
$corerelease
;
}
$toupgrade
[
'core'
]
=
$core
;
else
{
// Core doesn't need to be upgraded. Remove it from the list!
unset
(
$toupgrade
[
'core'
]);
}
}
// If we were just checking if the core needed to be upgraded, we can stop here
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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