diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-26 12:40:42 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-26 12:40:42 +0100 |
| commit | e86a3d001745656c6ec94837ff3275d4bc93aa5a (patch) | |
| tree | d42266d49cd3498fe2ed2b32a989004a837425c0 | |
| parent | 4dec7bf127fdb71c78d09bb4f64995028a60c439 (diff) | |
Fix pdo checking
Show only one message for both mysql and sqlite pdo conf. If one of them is ok,
PDO is ok.
See https://github.com/marienfressinaud/FreshRSS/issues/678
| -rw-r--r-- | lib/lib_rss.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 80eb206d2..8ae357f02 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -257,13 +257,13 @@ function is_referer_from_same_domain() { * @return array of tested values. */ function check_install_php() { + $pdo_mysql = extension_loaded('pdo_mysql'); + $pdo_sqlite = extension_loaded('pdo_sqlite'); return array( 'php' => version_compare(PHP_VERSION, '5.2.1') >= 0, 'minz' => file_exists(LIB_PATH . '/Minz'), 'curl' => extension_loaded('curl'), - 'pdo_mysql' => extension_loaded('pdo_mysql'), - 'pdo_sqlite' => extension_loaded('pdo_sqlite'), - 'pdo' => extension_loaded('pdo_mysql') || extension_loaded('pdo_sqlite'), + 'pdo' => $pdo_mysql || $pdo_sqlite, 'pcre' => extension_loaded('pcre'), 'ctype' => extension_loaded('ctype'), 'dom' => class_exists('DOMDocument'), |