From 706795330f75dea0801125df713cb90ab9cc898e Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Fri, 8 Jul 2016 17:00:58 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83?=
 =?UTF-8?q?=E3=83=88=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=A7=E3=81=8D=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 View/Helper/DateHelper.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/View/Helper/DateHelper.php b/View/Helper/DateHelper.php
index 5adac81d..766248c6 100644
--- a/View/Helper/DateHelper.php
+++ b/View/Helper/DateHelper.php
@@ -35,16 +35,20 @@ class DateHelper extends AppHelper {
  * Date Format
  *
  * @param datetime $date datetime
+ * @param null|string $format フォーマット
  * @return array
  */
-	public function dateFormat($date) {
+	public function dateFormat($date, $format = null) {
 		if (! Validation::datetime($date)) {
 			return null;
 		}
 		// ユーザタイムゾーンに変換
 		$date = $this->NetCommonsTime->toUserDatetime($date);
 
-		if ($this->_isToday($date)) {
+		if ($format) {
+			return date($format, strtotime($date));
+
+		} elseif ($this->_isToday($date)) {
 			return date('G:i', strtotime($date));
 
 		} elseif (! $this->_isThisYear($date)) {