Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d1334beb authored by Alexandre Flament's avatar Alexandre Flament Committed by GitHub
Browse files

Merge pull request #1023 from austinhuang0131/master 

[fix] return correct plugin path
parents b94fdd0d 96b8aac8

searx/templates/oscar/macros.html

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


<!-- Draw favicon -->

{% macro draw_favicon(favicon) -%}

    <img width="32" height="32" class="favicon" src="{{ url_for('static', filename='themes/oscar/img/icons/' + favicon + '.png') }}" alt="{{ favicon }}" />

    <img width="32" height="32" class="favicon" src="{{ url_for('static', filename='img/icons/' + favicon + '.png') }}" alt="{{ favicon }}" />

{%- endmacro %}



{%- macro result_link(url, title, classes='', id='') -%}

searx/webapp.py

+8 −5
Original line number Diff line number Diff line
@@ -348,12 +348,15 @@ def get_result_template(theme_name: str, template_name: str): 
def custom_url_for(endpoint: str, override_theme: Optional[str] = None, **values):

    suffix = ""

    if endpoint == 'static' and values.get('filename'):

        file_hash = static_files.get(values['filename'])

        if not file_hash:

            # try file in the current theme

            theme_name = get_current_theme_name(override=override_theme)

            filename_with_theme = "themes/{}/{}".format(theme_name, values['filename'])

        values['filename'] = filename_with_theme

        if get_setting('ui.static_use_hash', False):

            file_hash = static_files.get(filename_with_theme)

            if file_hash:

                values['filename'] = filename_with_theme

        if get_setting('ui.static_use_hash') and file_hash:

            suffix = "?" + file_hash

    if endpoint == 'info' and 'locale' not in values:

        locale = request.preferences.get_value('locale')