Skip to content

Commit 8d65452

Browse files
committed
remove duplicate php-version-checks from installer / updater
1 parent 61b56b2 commit 8d65452

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

install/install.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
//** Installer Interface
147147
//****************************************************************************************************
148148
$inst = new installer();
149-
if (!$inst->get_php_version()) die('ISPConfig requires PHP '.$inst->min_php."\n");
150149
$retval=shell_exec("which which");
151150
if (empty($retval)) die ("ISPConfig requires which \n");
152151

install/lib/installer_base.lib.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class installer_base {
3535
var $db;
3636
public $install_ispconfig_interface = true;
3737
public $is_update = false; // true if it is an update, falsi if it is a new install
38-
public $min_php = '5.4'; // minimal php-version for update / install
3938
protected $mailman_group = 'list';
4039

4140

@@ -151,12 +150,6 @@ public function set_immutable($path, $enable = true) {
151150
}
152151
}
153152

154-
//** Detect PHP-Version
155-
public function get_php_version() {
156-
if(version_compare(PHP_VERSION, $this->min_php, '<')) return false;
157-
else return true;
158-
}
159-
160153
public function crypt_password($cleartext_password, $charset = 'UTF-8') {
161154
if($charset != 'UTF-8') {
162155
$cleartext_password = mb_convert_encoding($cleartext_password, $charset, 'UTF-8');

install/update.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@
185185
$conf['ispconfig_log_priority'] = $conf_old["log_priority"];
186186

187187
$inst = new installer();
188-
if (!$inst->get_php_version()) die('ISPConfig requieres PHP '.$inst->min_php."\n");
189188
$inst->is_update = true;
190189

191190
$inst->check_prerequisites();

0 commit comments

Comments
 (0)