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[\s]*language[\s]*=("|\')php("|\')[\s]*>.*<\/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[\s]*language[\s]*=("|\')php("|\')[\s]*>.*<\/script>/Usm', '', $code);
+
             $code_css = Context::get('code_css');
             if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
             // Get the layout information