Commit d5d9b690 authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Fixed MANTIS-6002 (Theme wizard not adjusting colours for css_custom files)

parent 782e5a95

sources/themes3.php

+9 −2
Original line number Diff line number Diff line
@@ -293,9 +293,16 @@ function actual_copy_theme(string $theme, string $to, array $theme_images_to_ski 
        if ((preg_match('#^images(_custom)?/(.*)\.(' . implode('|', $THEME_IMAGE_EXTENSIONS) . ')$#', $file, $matches) != 0) && (isset($theme_images_to_skip_path_map['themes/' . $theme . '/' . $file]))) {

            continue;

        }

        if ((preg_match('#^css(_custom)?/(\w+)\.css$#', $file, $matches) != 0) && (isset($css_files_to_skip_flipped[$matches[1]]))) {



        $matches = [];

        if (preg_match('#^css(_custom)?/(\w+)\.css$#', $file, $matches) != 0) {

            $match_key = count($matches) - 1;

            $file_key = $matches[$match_key] . '.css';

            if (in_array($file_key, $css_files_to_skip_flipped)) {

                continue;

            }

        }



        if (($file == 'theme.ini') && (!$include_themeini)) {

            continue;

        }

sources/themewizard.php

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ function check_themewizard_theme(string $source_theme, string $algorithm, string 
        warn_exit($error);

    }



    if (get_theme_option('supports_themewizard_equations', null, $source_theme) == '0') {

    if (($algorithm != 'hsv') && (get_theme_option('supports_themewizard_equations', null, $source_theme) == '0')) {

        $algorithm = 'hsv';

        attach_message(do_lang_tempcode('EQUATIONS_NOT_SUPPORTED'), 'notice');

    }