X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsystem_tests.inc;h=17d89b63b433a26b44a9bcc8fa89b831c070f588;hb=e771cab507c120f329e50a71807dd4c53c0ace96;hp=1e8881a164842600a784819921764d8c41703134;hpb=95ff74b5722826544743a01daf527aa3c9efe11a;p=fa-stable.git

diff --git a/includes/system_tests.inc b/includes/system_tests.inc
index 1e8881a1..17d89b63 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;
@@ -221,7 +224,7 @@ function tst_tmpdir()
 	
 	$test['descr'] = _('Temporary directory');
 	$test['type'] = 3;
-	$test['test'] = $path_to_root.'/tmp';
+	$test['test'] = VARLIB_PATH;
 	$test['result'] = is_dir($test['test']) && is_writable($test['test']);
 	$test['comments'][] = sprintf(_("'%s' is not writeable"), $test['test']);
 	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);