Merge branch 'MAGETWO-35583' into BUGS

okarpenko · okarpenko · commit 0280dfc1e9f5 · 2015-03-30T15:02:16.000+03:00
Conflicts:
	app/code/Magento/Payment/Block/Info/Cc.php
diff --git a/app/code/Magento/Payment/Block/Info/Cc.php b/app/code/Magento/Payment/Block/Info/Cc.php
@@ -78,7 +78,7 @@ public function getCcExpMonth()
     public function getCcExpDate()
     {
         $date = new \DateTime('now', new \DateTimeZone($this->_localeDate->getConfigTimezone()));
-        $date->setDate($this->getInfo()->getCcExpYear(),$this->getInfo()->getCcExpMonth(), 1);
+        $date->setDate($this->getInfo()->getCcExpYear(), $this->getInfo()->getCcExpMonth() + 1, 0);
         return $date;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function getCcExpMonth()`
`78`	`78`	`public function getCcExpDate()`
`79`	`79`	`{`
`80`	`80`	`$date = new \DateTime('now', new \DateTimeZone($this->_localeDate->getConfigTimezone()));`
`81`		`- $date->setDate($this->getInfo()->getCcExpYear(),$this->getInfo()->getCcExpMonth(), 1);`
	`81`	`+ $date->setDate($this->getInfo()->getCcExpYear(), $this->getInfo()->getCcExpMonth() + 1, 0);`
`82`	`82`	`return $date;`
`83`	`83`	`}`
`84`	`84`