[BUGFIX] fixed error cause by wrong argument in Format/Date view helper

dwenzel · Oct 21, 2015 · 6419489 · 6419489
1 parent 5a28bb4
commit 6419489
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Classes/ViewHelpers/Format/DateViewHelper.php b/Classes/ViewHelpers/Format/DateViewHelper.php
@@ -11,6 +11,7 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 use TYPO3\CMS\Core\Utility\MathUtility;
+use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
  * Formats a \DateTime object. This is an extended version which allows to
@@ -69,7 +70,7 @@
  *
  * @api
  */
-class DateViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
+class DateViewHelper extends AbstractViewHelper {
 
 	/**
 	 * @var boolean
@@ -83,6 +84,7 @@ class DateViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
 	 * @param mixed $date either a DateTime object or a string that is accepted by DateTime constructor
 	 * @param string $format Format String which is taken to format the Date/Time
 	 * @param int $time an integer representing a time value
+	 * @param mixed $base A base time (a DateTime object or a string) used if $date is a relative date specification. Defaults to current time.
 	 * @return string Formatted date
 	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception
 	 */
@@ -96,13 +98,10 @@ public function render($date = NULL, $format = '', $time = NULL, $base = NULL) {
 		}
 
 		if ($date === NULL) {
-			$modifiedDate = $this->renderChildren();
-			if ($modifiedDate === NULL) {
+			$date = $this->renderChildren();
+			if ($date === NULL) {
 				return '';
 			}
-		} else {
-			// we have to clone it - otherwise we would change the date!
-			$modifiedDate = clone($date);
 		}
 
 		if ($date === '') {
@@ -118,7 +117,10 @@ public function render($date = NULL, $format = '', $time = NULL, $base = NULL) {
 			} catch (\Exception $exception) {
 				throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception('"' . $date . '" could not be parsed by \DateTime constructor.', 1241722579);
 			}
+		} else {
+			$modifiedDate = clone($date);
 		}
+
 		if ($time !== NULL) {
 			$modifiedDate->setTimestamp($modifiedDate->getTimestamp() + $time);
 		}