ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #1023 from austinhuang0131/master 

[fix] return correct plugin path
This commit is contained in:
Alexandre Flament 2022-03-29 21:27:16 +02:00 committed by GitHub
parent b94fdd0df0 96b8aac826
commit d1334beb4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
searx/templates/oscar/macros.html
View File

@ -5,7 +5,7 @@
<!-- Draw favicon --> <!-- Draw favicon -->
{% macro draw_favicon(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 %} {%- endmacro %}
{%- macro result_link(url, title, classes='', id='') -%} {%- macro result_link(url, title, classes='', id='') -%}

13
searx/webapp.py
View File

@ -348,13 +348,16 @@ def get_result_template(theme_name: str, template_name: str):
def custom_url_for(endpoint: str, override_theme: Optional[str] = None, **values): def custom_url_for(endpoint: str, override_theme: Optional[str] = None, **values):
suffix = "" suffix = ""
if endpoint == 'static' and values.get('filename'): if endpoint == 'static' and values.get('filename'):
theme_name = get_current_theme_name(override=override_theme) file_hash = static_files.get(values['filename'])
filename_with_theme = "themes/{}/{}".format(theme_name, values['filename']) if not file_hash:
values['filename'] = filename_with_theme # try file in the current theme
if get_setting('ui.static_use_hash', False): theme_name = get_current_theme_name(override=override_theme)
filename_with_theme = "themes/{}/{}".format(theme_name, values['filename'])
file_hash = static_files.get(filename_with_theme) file_hash = static_files.get(filename_with_theme)
if file_hash: if file_hash:
suffix = "?" + 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: if endpoint == 'info' and 'locale' not in values:
locale = request.preferences.get_value('locale') locale = request.preferences.get_value('locale')
if _INFO_PAGES.get_page(values['pagename'], locale) is None: if _INFO_PAGES.get_page(values['pagename'], locale) is None: