Index: scripts/coder_format/CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/CHANGELOG.txt,v
retrieving revision 1.3
diff -u -p -r1.3 CHANGELOG.txt
--- scripts/coder_format/CHANGELOG.txt	4 Dec 2008 02:43:34 -0000	1.3
+++ scripts/coder_format/CHANGELOG.txt	19 Jan 2009 00:19:50 -0000
@@ -4,8 +4,9 @@ Coder_format x.x-x.x, xxxx-xx-xx
 --------------------------------
 
 
-Coder_format 6.x-1.x, xxxx-xx-xx
+Coder_format 7.x-1.x, xxxx-xx-xx
 --------------------------------
+#246568 by sun: Updated for new string concatenation standard.
 #272089 by sun: Fixed outdated installation instructions for coder_format tests.
 #208767 by ezyang, sun: Improved coder_format to re-format Drupal 6 core without
   wrong formattings
Index: scripts/coder_format/coder_format.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/coder_format.inc,v
retrieving revision 1.3
diff -u -p -r1.3 coder_format.inc
--- scripts/coder_format/coder_format.inc	24 Feb 2008 19:40:50 -0000	1.3
+++ scripts/coder_format/coder_format.inc	19 Jan 2009 00:22:31 -0000
@@ -458,13 +458,8 @@ function coder_format_string($code = '')
           break;
 
         case '.':
-          if (substr(rtrim($result), -1) == "'" || substr(rtrim($result), -1) == '"') {
-            // Write string concatenation character directly after strings.
-            $result = rtrim($result) . $text .' ';
-          }
-          else {
-            $result = rtrim($result) .' '. $text .' ';
-          }
+          // Starting from 7.x, string concatenations follow PEAR's standard.
+          $result = rtrim($result) . ' ' . $text . ' ';
           break;
 
         case '=':
@@ -516,10 +511,6 @@ function coder_format_string($code = '')
           if (rtrim($result) != "\\") {
             $in_quote = $in_quote ? false : true;
           }
-          if (substr($result, -3) == ' . ') {
-            // Write string concatenation character directly before strings.
-            $result = rtrim($result);
-          }
           $result .= $text;
           break;
 
@@ -603,17 +594,6 @@ function coder_format_string($code = '')
           break;
 
         case T_CONSTANT_ENCAPSED_STRING:
-          // Handle special string concatenation case: 'bar' . 'baz'
-          $c = substr($result, -3);
-          if ($c == '". ' || $c == '\'. ') {
-            $result = rtrim($result, ' .');
-            $result .= ' . ';
-          }
-          // Handle special string concatenation case: 'bar'. $foo
-          elseif (substr($result, -2) == '. ') {
-            $result = rtrim($result);
-          }
-          // Move on to T_STRING / T_VARIABLE.
         case T_STRING:
         case T_VARIABLE:
           // No space after object operator ($foo->bar) and error suppression (@function()).