zaclys
/
searxng
mirror of https://github.com/searxng/searxng.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[fix] merge fake "plugins" endpoint back to "static" 

https: //matrix.to/#/!vxScbLNEAmRvOraXBn:matrix.org/$0zqTtH3s-eVKlMwiAgiEJdetOkRx27EIRs-C0o8FzSg?via=libera.chat&via=matrix.org&via=tchncs.de
Co-Authored-By: Alexandre Flament <alex.andre@al-f.net>
This commit is contained in:
Austin Huang 2022-03-29 13:02:21 -04:00
parent f99d109ceb
commit 6353b850b0
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@
data-infinite-scroll="{% if infinite_scroll %}true{% else %}false{% endif %}" data-infinite-scroll="{% if infinite_scroll %}true{% else %}false{% endif %}"
data-translations="{{ translations }}"></script> data-translations="{{ translations }}"></script>
{% for script in scripts %} {% for script in scripts %}
{{""}}<script src="{{ url_for('plugins', filename=script) }}"></script> {{""}}<script src="{{ url_for('static', filename=script) }}"></script>
{% endfor %} {% endfor %}
<noscript> <noscript>
<style> <style>

20
searx/webapp.py
View File

@ -348,19 +348,15 @@ 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: values['filename'] = filename_with_theme
suffix = "?" + file_hash if get_setting('ui.static_use_hash') and file_hash:
if endpoint == 'plugins' and values.get('filename'): suffix = "?" + file_hash
endpoint = 'static'
if get_setting('ui.static_use_hash', False):
file_hash = static_files.get(values['filename'])
if 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: