diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-02-13 17:13:11 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-02-13 17:13:11 +0100 |
commit | af13787e74ea45d7edc1005810f15a8baa428a77 (patch) | |
tree | 5dc3cbea022229e3f720098ba05653279adb14fe /install/install_functions.php | |
parent | d7d88631e125c98cc2e7432c8147afc2ceda3d42 (diff) | |
download | wallabag-af13787e74ea45d7edc1005810f15a8baa428a77.tar.gz wallabag-af13787e74ea45d7edc1005810f15a8baa428a77.tar.zst wallabag-af13787e74ea45d7edc1005810f15a8baa428a77.zip |
fix #1078
Diffstat (limited to 'install/install_functions.php')
-rw-r--r-- | install/install_functions.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/install/install_functions.php b/install/install_functions.php index 4a18d7d8..a4830569 100644 --- a/install/install_functions.php +++ b/install/install_functions.php | |||
@@ -28,6 +28,7 @@ $gettext_ok = function_exists("gettext"); | |||
28 | $gd_ok = extension_loaded('gd'); | 28 | $gd_ok = extension_loaded('gd'); |
29 | $pdo_drivers = pdoDrivers(); | 29 | $pdo_drivers = pdoDrivers(); |
30 | $pdo_drivers_passing = $pdo_drivers['sqlite'] || $pdo_drivers['mysql'] || $pdo_drivers['postgres']; | 30 | $pdo_drivers_passing = $pdo_drivers['sqlite'] || $pdo_drivers['mysql'] || $pdo_drivers['postgres']; |
31 | $urlfetching = $curl_ok || $allow_url_fopen_ok; | ||
31 | 32 | ||
32 | 33 | ||
33 | 34 | ||
@@ -46,7 +47,7 @@ $status = array('app_name' => $app_name, 'php' => $php_ok, 'pdo' => $pdo_ok, | |||
46 | 'pdo_drivers_passing' => $pdo_drivers_passing, 'xml' => $xml_ok, 'pcre' => $pcre_ok, | 47 | 'pdo_drivers_passing' => $pdo_drivers_passing, 'xml' => $xml_ok, 'pcre' => $pcre_ok, |
47 | 'zlib' => $zlib_ok, 'mbstring' => $mbstring_ok, 'dom' => $dom_ok, 'iconv' => $iconv_ok, 'tidy' => $tidy_ok, 'curl' => $curl_ok, | 48 | 'zlib' => $zlib_ok, 'mbstring' => $mbstring_ok, 'dom' => $dom_ok, 'iconv' => $iconv_ok, 'tidy' => $tidy_ok, 'curl' => $curl_ok, |
48 | 'parse_ini' => $parse_ini_ok, 'parallel' => $parallel_ok, 'allow_url_fopen' => $allow_url_fopen_ok, 'filter' => $filter_ok, | 49 | 'parse_ini' => $parse_ini_ok, 'parallel' => $parallel_ok, 'allow_url_fopen' => $allow_url_fopen_ok, 'filter' => $filter_ok, |
49 | 'gettext' => $gettext_ok, 'gd' => $gd_ok); | 50 | 'gettext' => $gettext_ok, 'gd' => $gd_ok, 'urlfetching' => $urlfetching); |
50 | 51 | ||
51 | return $status; | 52 | return $status; |
52 | } | 53 | } |
@@ -56,7 +57,7 @@ function isOkay() { | |||
56 | 57 | ||
57 | function isPassing() { | 58 | function isPassing() { |
58 | $status = status(); | 59 | $status = status(); |
59 | unset($status['curl'], $status['parallel'], $status['tidy'], $status['gd'], $status['filter']); | 60 | unset($status['curl'], $status['parallel'], $status['tidy'], $status['gd'], $status['filter'], $status['allow_url_fopen']); |
60 | return !in_array(false, $status); | 61 | return !in_array(false, $status); |
61 | } | 62 | } |
62 | 63 | ||