From e739f300880dd9f2ece73b35209f8428c4713ff7 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Sun, 12 Aug 2012 18:23:48 +0000 Subject: [PATCH] fixed: when using Request::ajax_serializer then we should not use html filter (the filter can be used before we make the json answer -- not implemented yet) git-svn-id: svn://ttmath.org/publicrep/winix/trunk@872 e52654a7-88a9-db11-a3e9-0013d4bc506e --- core/app.cpp | 2 +- core/pluginmsg.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/app.cpp b/core/app.cpp index 01b7ae7..4cd9b29 100755 --- a/core/app.cpp +++ b/core/app.cpp @@ -925,7 +925,7 @@ void App::FilterCompressSend(bool compressing, int compress_encoding, const std: bool raw = cur.request->is_item && cur.request->item.content_type == Item::ct_raw && cur.request->status == WINIX_ERR_OK && cur.request->function && (cur.request->function == &functions.fun_cat || cur.request->function == &functions.fun_run); - if( config.html_filter && cur.request->use_html_filter && !raw ) + if( config.html_filter && cur.request->use_html_filter && !raw && !cur.request->ajax_serializer ) { TemplatesFunctions::html_filter.Filter(*source, clean_html); AddDebugInfo(clean_html); diff --git a/core/pluginmsg.h b/core/pluginmsg.h index ec4e9cb..1ea6214 100755 --- a/core/pluginmsg.h +++ b/core/pluginmsg.h @@ -249,6 +249,8 @@ // this is sent from the other thread (without locking) // in p1 you have a pointer to PT::Space // session is null +// if you process the job then return 'true' from the processing method (from plugin call) +// so this prevent to make a standard (system) job #define WINIX_JOB 31200