Merge remote-tracking branch 'origin/MAGETWO-89625' into 2.3-develop-pr7

OlgaVasyltsun · OlgaVasyltsun · commit 0c461bb18567 · 2018-03-27T14:44:27.000+03:00
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
@@ -224,6 +224,7 @@ class Config extends AbstractConfig
         'TWD',
         'THB',
         'USD',
+        'INR',
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php b/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php
@@ -65,7 +65,7 @@ public function __toString()
         }
         return sprintf(
             'TRIM(%s)',
-            $this->adapter->getConcatSql($columns, ' ')
+            $this->adapter->getConcatSql($columns, $this->separator)
         );
     }
 }

-Original file line number
+Diff line change
         'TWD',
         'THB',
         'USD',
 +        'INR',
     ];
     /**
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function __toString()`
`65`	`65`	`}`
`66`	`66`	`return sprintf(`
`67`	`67`	`'TRIM(%s)',`
`68`		`- $this->adapter->getConcatSql($columns, ' ')`
	`68`	`+ $this->adapter->getConcatSql($columns, $this->separator)`
`69`	`69`	`);`
`70`	`70`	`}`
`71`	`71`	`}`