diff options
| author |  Alexis Degrugillier <aledeg@users.noreply.github.com>
| 2020-12-28 18:12:17 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-12-29 00:12:17 +0100 |
| commit | 618cbaf0cee04092c5eb33ff818decac2c8e80b7 (patch) | |
| tree | 357e6d59f35e07be523abcec328ac587c7ed7dd1 | |
| parent | 3f4c86f80f7cf7fd0ba9260d46eafc55d46fe9af (diff) | |
Remove Minz validation during install. (#3302)
As FRSS always comes with Minz, there is no need to validate that
it is there during install. If it turns out we need to validate that,
we might need to validate other libraries as well.
| -rw-r--r-- | app/install.php | 6 | ||||
| -rw-r--r-- | lib/lib_install.php | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/app/install.php b/app/install.php index 37ce5b0f6..fc296b405 100644 --- a/app/install.php +++ b/app/install.php @@ -384,12 +384,6 @@ function printStep1() { <p class="alert alert-error"><span class="alert-head"><?= _t('gen.short.damn') ?></span> <?= _t('install.check.php.nok', PHP_VERSION, '5.6.0') ?></p> <?php } ?> - <?php if ($res['minz'] == 'ok') { ?> - <p class="alert alert-success"><span class="alert-head"><?= _t('gen.short.ok') ?></span> <?= _t('install.check.minz.ok') ?></p> - <?php } else { ?> - <p class="alert alert-error"><span class="alert-head"><?= _t('gen.short.damn') ?></span> <?= _t('install.check.minz.nok', join_path(LIB_PATH, 'Minz')) ?></p> - <?php } ?> - <?php if ($res['pdo'] == 'ok') { ?> <p class="alert alert-success"><span class="alert-head"><?= _t('gen.short.ok') ?></span> <?= _t('install.check.pdo.ok') ?></p> <?php } else { ?> diff --git a/lib/lib_install.php b/lib/lib_install.php index f171deb4a..14a614c2e 100644 --- a/lib/lib_install.php +++ b/lib/lib_install.php @@ -7,7 +7,6 @@ Minz_Configuration::register('default_user', join_path(FRESHRSS_PATH, 'config-us function checkRequirements($dbType = '') { $php = version_compare(PHP_VERSION, '5.6.0') >= 0; - $minz = file_exists(join_path(LIB_PATH, 'Minz')); $curl = extension_loaded('curl'); $pdo_mysql = extension_loaded('pdo_mysql'); $pdo_sqlite = extension_loaded('pdo_sqlite'); @@ -50,7 +49,6 @@ function checkRequirements($dbType = '') { return array( 'php' => $php ? 'ok' : 'ko', - 'minz' => $minz ? 'ok' : 'ko', 'curl' => $curl ? 'ok' : 'ko', 'pdo-mysql' => $pdo_mysql ? 'ok' : 'ko', 'pdo-sqlite' => $pdo_sqlite ? 'ok' : 'ko', @@ -69,7 +67,7 @@ function checkRequirements($dbType = '') { 'favicons' => $favicons ? 'ok' : 'ko', 'http_referer' => $http_referer ? 'ok' : 'ko', 'message' => $message ?: 'ok', - 'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $dom && $xml && + 'all' => $php && $curl && $pdo && $pcre && $ctype && $dom && $xml && $data && $cache && $users && $favicons && $http_referer && $message == '' ? 'ok' : 'ko' ); } |