if ($installType == 'drupal') {
// Ensure that they have downloaded the correct version of CiviCRM
- if ($civicrm_version['cms'] != 'Drupal' && $civicrm_version['cms'] != 'Drupal6') {
+ if ($civicrm_version['cms'] != 'Drupal') {
$errorTitle = ts("Oops! Incorrect CiviCRM version");
$errorMsg = ts("This installer can only be used for the Drupal version of CiviCRM.");
errorDisplayPage($errorTitle, $errorMsg);
}
/**
- * @param null $section
+ * @param string|null $section
*/
public function showTable($section = NULL) {
if ($section) {
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'], $version) == -1) {
+ $testDetails[2] .= "{$majorHas}.{$minorHas}.";
+ $this->error($testDetails);
+ }
+ else {
+ return TRUE;
+ }
}
}
}