Join echos

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@642 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/_compile.php b/_compile.php
index a7040683216c5eb1df485873f486a10ecf33a30a..bb4f7bef74575776861ac2f7a15146bb282d3d35 100644 (file)
--- a/_compile.php
+++ b/_compile.php
@@ -110,7 +110,8 @@ function php_shrink($input) {
        $set = array_flip(preg_split('//', '!"#$&\'()*+,-./:;<=>?@[\]^`{|}'));
        $space = '';
        $output = '';
-       foreach ($tokens as $i => $token) {
+       $in_echo = false;
+       for (reset($tokens); list($i, $token) = each($tokens); ) {
                if (!is_array($token)) {
                        $token = array(0, $token);
                }
@@ -123,6 +124,15 @@ function php_shrink($input) {
                                if ($token[1] == ';') {
                                        $shortening = true;
                                }
+                       } elseif ($token[0] == T_ECHO) {
+                               $in_echo = true;
+                       } elseif ($token[1] == ';' && $in_echo) {
+                               $in_echo = false;
+                               if ($tokens[$i+1][0] === T_WHITESPACE && $tokens[$i+2][0] === T_ECHO) {
+                                       next($tokens);
+                                       next($tokens);
+                                       $token[1] = '.'; //! join ''.'' and "".""
+                               }
                        } elseif ($token[0] === T_VARIABLE && !isset($special_variables[$token[1]])) {
                                $token[1] = '$' . $short_variables[$token[1]];
                        } elseif ($token[0] === T_STRING && $tokens[$i+1] === '(' && isset($defined_functions[$token[1]])