diff options
| author | Alexandre Flament <alex@al-f.net> | 2022-03-29 21:27:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 21:27:16 +0200 |
| commit | d1334beb4fb16beec298f894d75e94b241499e06 (patch) | |
| tree | d12a89a36e9f857842309b6220ea62fcd0ca6cb5 | |
| parent | b94fdd0df0c01099554e04e7ae53c2b135e6a1fd (diff) | |
| parent | 96b8aac826703a10591b9a2379829cf9ea1c1c47 (diff) | |
| download | searxng-d1334beb4fb16beec298f894d75e94b241499e06.tar.gz searxng-d1334beb4fb16beec298f894d75e94b241499e06.zip | |
Merge pull request #1023 from austinhuang0131/master
[fix] return correct plugin path
| -rw-r--r-- | searx/templates/oscar/macros.html | 2 | ||||
| -rwxr-xr-x | searx/webapp.py | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index 2b27cfd28..ed1499c15 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -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='') -%} diff --git a/searx/webapp.py b/searx/webapp.py index 2f27d0f64..47a3c5bd2 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -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): suffix = "" if endpoint == 'static' and values.get('filename'): - 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(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']) file_hash = static_files.get(filename_with_theme) 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: locale = request.preferences.get_value('locale') if _INFO_PAGES.get_page(values['pagename'], locale) is None: |