projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2a684b
)
dev/core#1860 Fix installing on PHP7.3 Ubuntu 20.04 and MariaDB 10.3
author
Seamus Lee
<seamuslee001@gmail.com>
Wed, 8 Jul 2020 22:04:30 +0000
(08:04 +1000)
committer
Seamus Lee
<seamuslee001@gmail.com>
Wed, 8 Jul 2020 22:07:43 +0000
(08:07 +1000)
install/index.php
patch
|
blob
|
blame
|
history
diff --git
a/install/index.php
b/install/index.php
index 34913643ba95515d68de694100363224c6c5334f..5ed5587e21f6ed3251971c88f539aade10848fac 100644
(file)
--- a/
install/index.php
+++ b/
install/index.php
@@
-1069,8
+1069,14
@@
class InstallRequirements {
return TRUE;
}
else {
- $testDetails[2] .= "{$majorHas}.{$minorHas}.";
- $this->error($testDetails);
+ $versionDetails = mysqli_query($this->conn, 'SELECT version() as version')->fetch_assoc();
+ if (version_compare($versionDetails['version'], $min) == -1) {
+ $testDetails[2] .= "{$majorHas}.{$minorHas}.";
+ $this->error($testDetails);
+ }
+ else {
+ return TRUE;
+ }
}
}
}