Adding DateUtil::diff barebone

diff --git a/wcfsetup/install/files/lib/system/template/plugin/DatediffModifierTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/DatediffModifierTemplatePlugin.class.php
index 289b62d6a272e99ef1ea2bdf0dcf86d020b2a173..1be62ee1bda2655e42b2eb189fabf9e9e7dc163a 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/plugin/DatediffModifierTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/DatediffModifierTemplatePlugin.class.php
@@ -27,8 +27,6 @@ class DatediffModifierTemplatePlugin implements IModifierTemplatePlugin {
                $start = min($tagArgs[0], $tagArgs[1]);
                $end = max($tagArgs[0], $tagArgs[1]);
                
-               // TODO: method doesn't exists anymore
-               // return DateUtil::diff($start, $end, 'string');
-               return '';
+               return DateUtil::diff(DateUtil::getDateTimeByTimestamp($start), DateUtil::getDateTimeByTimestamp($end));
        }
 }

diff --git a/wcfsetup/install/files/lib/util/DateUtil.class.php b/wcfsetup/install/files/lib/util/DateUtil.class.php
index 2467b5bf8a94ea853dcd9256398fda5eded2e57d..81d7c4aebd325c2e07ab7a2e7abcc631fef7a0c4 100644 (file)
--- a/wcfsetup/install/files/lib/util/DateUtil.class.php
+++ b/wcfsetup/install/files/lib/util/DateUtil.class.php
@@ -300,5 +300,12 @@ final class DateUtil {
                }
        }
        
+       public static function diff(\DateTime $from, \DateTime $to) {
+               $interval = $from->diff($to);
+               
+               // TODO: Use language items
+               return $interval->format('%Y years %M months %D days %H hours %I minutes %S seconds');
+       }
+       
        private function __construct() { }
 }