summaryrefslogtreecommitdiffstats
path: root/pyload/webui
diff options
context:
space:
mode:
authorGravatar Armin <Armin@Armin-PC.diedering.lan> 2015-04-09 20:11:11 +0200
committerGravatar Armin <Armin@Armin-PC.diedering.lan> 2015-04-09 20:11:11 +0200
commitf53d57b902b71708f05a3125872ec5d34ebe65b9 (patch)
tree2f8756396411a98331cb937e42ded87da2c9f253 /pyload/webui
parentMerge remote-tracking branch 'origin/0.4.10' into 0.4.10 (diff)
downloadpyload-f53d57b902b71708f05a3125872ec5d34ebe65b9.tar.xz
fix: OboomCom and SmoozedCom with beaker >= v1.7.x
fix: run plugins this fix makes the plugin attribute "__name" obsolet
Diffstat (limited to 'pyload/webui')
-rw-r--r--pyload/webui/app/pyloadweb.py2
-rw-r--r--pyload/webui/app/utils.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/pyload/webui/app/pyloadweb.py b/pyload/webui/app/pyloadweb.py
index d7604918b..fd6e8c89a 100644
--- a/pyload/webui/app/pyloadweb.py
+++ b/pyload/webui/app/pyloadweb.py
@@ -94,7 +94,7 @@ def server_min(theme, file):
def server_js(theme, file):
response.headers['Content-Type'] = "text/javascript; charset=UTF-8"
- if "/render/" in file or ".render." in file:
+ if "/render/" in file or ".render." in file or True:
response.headers['Expires'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT",
time.gmtime(time.time() + 24 * 7 * 60 * 60))
response.headers['Cache-control'] = "public"
diff --git a/pyload/webui/app/utils.py b/pyload/webui/app/utils.py
index fd0e14cfa..4a431493b 100644
--- a/pyload/webui/app/utils.py
+++ b/pyload/webui/app/utils.py
@@ -12,7 +12,7 @@ from pyload.api import has_permission, PERMS, ROLE
def render_to_response(file, args={}, proc=[]):
for p in proc:
args.update(p())
- path = join(THEME, "tml", file)
+ path = "tml/" + file
return env.get_template(path).render(**args)