From df1353c4f2fb4aacae16024d2c7f5ff489a52947 Mon Sep 17 00:00:00 2001 From: flyskyko Date: Thu, 15 Mar 2012 09:23:43 +0000 Subject: [PATCH] merge r10132 from branch 1.5.0 to trunk git-svn-id: http://xe-core.googlecode.com/svn/trunk@10435 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/layout/layout.admin.controller.php | 3 ++- modules/layout/layout.view.php | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index d83f61337..3e1f0d6b6 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -249,7 +249,8 @@ return new Object(-1, 'msg_invalid_request'); } - $code = preg_replace('/<\?.*(\?>)?/sm', '', $code); + $code = preg_replace('/<\?.*(\?>)?/Usm', '', $code); + $code = preg_replace('/.*<\/script>/Usm', '', $code); $oLayoutModel = &getModel('layout'); $layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl); diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php index 772996ccc..56926c9e5 100644 --- a/modules/layout/layout.view.php +++ b/modules/layout/layout.view.php @@ -40,6 +40,10 @@ $layout_srl = Context::get('layout_srl'); $code = Context::get('code'); + + $code = preg_replace('/<\?.*(\?>)?/Usm', '', $code); + $code = preg_replace('/.*<\/script>/Usm', '', $code); + $code_css = Context::get('code_css'); if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request'); // Get the layout information