Merge remote branch 'upstream/merchant_beta' into merchant_beta

Sergey Nosov · Sergey Nosov · commit b1161044c962 · 2015-11-04T05:00:21.000-08:00
diff --git a/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
@@ -146,7 +146,8 @@ public function showCustomerInfo()
             [
                 'customer' => $this->getTable('customer_entity')
             ],
-            'main_table.customer_id = customer.entity_id'
+            'main_table.customer_id = customer.entity_id',
+            ['firstname', 'lastname']
         );
         return $this;
     }

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,8 @@ public function showCustomerInfo()`
`146`	`146`	`[`
`147`	`147`	`'customer' => $this->getTable('customer_entity')`
`148`	`148`	`],`
`149`		`- 'main_table.customer_id = customer.entity_id'`
	`149`	`+ 'main_table.customer_id = customer.entity_id',`
	`150`	`+ ['firstname', 'lastname']`
`150`	`151`	`);`
`151`	`152`	`return $this;`
`152`	`153`	`}`