Browse Source

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
Marien Fressinaud 11 years ago
parent
commit
e86a3d0017
1 changed files with 3 additions and 3 deletions
  1. 3 3
      lib/lib_rss.php

+ 3 - 3
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'),