summaryrefslogtreecommitdiffstats
path: root/lib/public/template.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-24 16:37:04 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-12-10 11:58:56 +0100
commit4d232e536eb03895863c0d7d7fe703c41d433f70 (patch)
tree2adb86d986c986f4c34fac9fedb287f9a51191d5 /lib/public/template.php
parent681caf882a5f28b0b6f7cb9a1f16b3dea26ff5f2 (diff)
downloadnextcloud-server-4d232e536eb03895863c0d7d7fe703c41d433f70.tar.gz
nextcloud-server-4d232e536eb03895863c0d7d7fe703c41d433f70.zip
Deprecate Util::formatDate()
Make DateTimeFormatter a service and adjust tests that have been inaccurate
Diffstat (limited to 'lib/public/template.php')
-rw-r--r--lib/public/template.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/public/template.php b/lib/public/template.php
index 93af794ba62..89934a842ed 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -94,6 +94,7 @@ function human_file_size( $bytes ) {
* @param int $timestamp unix timestamp
* @param boolean $dateOnly
* @return \OC_L10N_String human readable interpretation of the timestamp
+ *
* @deprecated Use \OCP\Template::relative_modified_date() instead
*/
function relative_modified_date( $timestamp, $dateOnly = false ) {
@@ -188,12 +189,12 @@ class Template extends \OC_Template {
}
/**
- * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
- *
- * @param int $timestamp unix timestamp
- * @param boolean $dateOnly
- * @return \OC_L10N_String human readable interpretation of the timestamp
- */
+ * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
+ *
+ * @param int $timestamp unix timestamp
+ * @param boolean $dateOnly
+ * @return string human readable interpretation of the timestamp
+ */
public static function relative_modified_date($timestamp, $dateOnly = false) {
return \relative_modified_date($timestamp, null, $dateOnly);
}