New Report: Inventory purchasing transaction based report

[fa-stable.git] / includes / system_tests.inc

diff --git a/includes/system_tests.inc b/includes/system_tests.inc
index 1e8881a164842600a784819921764d8c41703134..50add5931709447a193f80d12584c8e0f2075e0d 100644 (file)
--- 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;
@@ -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);