From 4e19d6e03440dbcc1d92b494f0b2c9b42d1376a8 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Thu, 27 Aug 2009 07:28:48 +0000
Subject: [PATCH] Use comma in consecutive echos

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1025 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 compile.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compile.php b/compile.php
index 677d87cb..a7ce070d 100644
--- a/compile.php
+++ b/compile.php
@@ -132,9 +132,13 @@ function php_shrink($input) {
 				if ($tokens[$i+1][0] === T_ECHO) {
 					// join two consecutive echos
 					next($tokens);
+<<<<<<< HEAD:compile.php
 					$token[1] = '.'; //! join ''.'' and "".""
 				} else {
 					$in_echo = false;
+=======
+					$token[1] = ','; // '.' would conflict with "a".1+2 and would use more memory //! remove ',' and ","
+>>>>>>> Use comma in consecutive echos:compile.php
 				}
 			} elseif ($token[0] === T_VARIABLE && !isset($special_variables[$token[1]])) {
 				$token[1] = '$' . $short_variables[$token[1]];