From 5bc747f09404053ab8f5c028ae897583f17f22a9 Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <webmaster@web-t-sys.com>
Date: Tue, 22 Mar 2016 19:13:10 +0100
Subject: [PATCH] Fixes

---
 src/View.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/View.php b/src/View.php
index 96328b2..9ecca90 100644
--- a/src/View.php
+++ b/src/View.php
@@ -304,9 +304,13 @@ class View {
                                 
         $file=file_get_contents($view_real_path);
         
-        $file=preg_replace('/<\?=(.*?)\|\?>/', '<?php PhangoApp\PhaView\View::d($1); ?>', $file);
+        #<?php echo "([^\\"]*);([^\\"]*)"
         
-        $file=preg_replace('/<\?php echo\s+(.*?)\|n;/', '<?php PhangoApp\PhaView\View::d($1);', $file);
+        $file=preg_replace('/<\?php echo "([^\\"]*?);+([^\\"]*?)"/', '/<?php echo /', $file);
+        
+        $file=preg_replace('/<\?=(.*?)\|n\?>/', '<?php PhangoApp\PhaView\View::d($1); ?>', $file);
+        
+        $file=preg_replace('/<\?php echo\s+([^;]*?);\|n/', '<?php PhangoApp\PhaView\View::d($1);', $file);
         
         $file=preg_replace('/<\?=(.*?)\?>/', '<?=PhangoApp\PhaView\View::e($1)?>', $file);