X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsystem_tests.inc;h=50add5931709447a193f80d12584c8e0f2075e0d;hb=8251cfa8dedaf1091e063989259db33f2f0f1a28;hp=f4955627cf9e2e805857063aa19d7e90f8f4c7e5;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/includes/system_tests.inc b/includes/system_tests.inc
index f4955627..50add593 100644
--- a/includes/system_tests.inc
+++ b/includes/system_tests.inc
@@ -24,7 +24,10 @@ function tst_mysql()
 	$test['descr'] = _('MySQL version'). ' >=4.1';
 	$test['type'] = 3;
 	$test['test'] = db_get_version();
-	$test['result'] = $test['test']>='4.1';
+	if (!($test['result'] = ($test['test']>='4.1'))) {
+		$db_str = explode('-', $test['test']);
+		$test['result'] = ($db_str[1] == 'MariaDB');
+	}
 	$test['comments'] = _('Upgrade MySQL server to version at least 4.1');
 
 	return $test;
@@ -43,11 +46,11 @@ function tst_phpmysql()
 
 function tst_php() 
 {
-	$test['descr'] = _('PHP version').' >=4.3.3';
+	$test['descr'] = _('PHP version').' >=5.0.0';
 	$test['type'] = 3;
 	$test['test'] = phpversion();
-	$test['result'] = $test['test']>='4.3.3';
-	$test['comments'] = _('Upgrade PHP to version at least 4.3.3');
+	$test['result'] = $test['test']>='5.0.0';
+	$test['comments'] = _('Upgrade PHP to version at least 5.0.0');
 
 	return $test;
 }
@@ -375,8 +378,8 @@ function tst_extconfig($install)
 	$themedir = opendir($fname);
 	while (false !== ($fname = readdir($themedir)))
 	{
-		if ($fname!='.' && $fname!='..' && $fname!='CVS' && is_dir($path_to_root.'/themes/'.$fname)
-			&& !in_array($fname, array('aqua', 'cool', 'default')))
+		if ($fname!='.' && $fname!='..' && is_dir($path_to_root.'/themes/'.$fname)
+			&& !in_array($fname, array('canvas', 'default', 'dropdown')))
 		{
 			$test['test'][] = $fname;
 			$test['result'] = is_writable($path_to_root.'/themes/'.$fname);