From 1ee695041dd776d216d59deff3788306811934ff Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Sat, 21 Jan 2012 17:22:32 -0600 Subject: [PATCH] issue 623, thanks Gergely Peli --- VERSION | 2 +- applications/admin/static/js/web2py.js | 6 ++++-- applications/examples/static/js/web2py.js | 6 ++++-- applications/welcome/static/js/web2py.js | 6 ++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 2adfbcf5..b41da809 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.4 (2012-01-21 16:59:06) stable +Version 1.99.4 (2012-01-21 17:22:25) stable diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js index 0b8dbf5b..ec9599fc 100644 --- a/applications/admin/static/js/web2py.js +++ b/applications/admin/static/js/web2py.js @@ -87,8 +87,10 @@ function web2py_ajax_page(method,action,data,target) { web2py_trap_form(action,target); web2py_trap_link(target); web2py_ajax_init('#'+target); - if(command) eval(command); - if(flash) jQuery('.flash').html(flash).slideDown(); + if(command) + eval(decodeURIComponent(escape(command))); + if(flash) + jQuery('.flash').html(decodeURIComponent(escape(flash))).slideDown(); } }); } diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js index 0b8dbf5b..ec9599fc 100644 --- a/applications/examples/static/js/web2py.js +++ b/applications/examples/static/js/web2py.js @@ -87,8 +87,10 @@ function web2py_ajax_page(method,action,data,target) { web2py_trap_form(action,target); web2py_trap_link(target); web2py_ajax_init('#'+target); - if(command) eval(command); - if(flash) jQuery('.flash').html(flash).slideDown(); + if(command) + eval(decodeURIComponent(escape(command))); + if(flash) + jQuery('.flash').html(decodeURIComponent(escape(flash))).slideDown(); } }); } diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js index 0b8dbf5b..ec9599fc 100644 --- a/applications/welcome/static/js/web2py.js +++ b/applications/welcome/static/js/web2py.js @@ -87,8 +87,10 @@ function web2py_ajax_page(method,action,data,target) { web2py_trap_form(action,target); web2py_trap_link(target); web2py_ajax_init('#'+target); - if(command) eval(command); - if(flash) jQuery('.flash').html(flash).slideDown(); + if(command) + eval(decodeURIComponent(escape(command))); + if(flash) + jQuery('.flash').html(decodeURIComponent(escape(flash))).slideDown(); } }); }