From 8ea76c837477ad6bda0f9d26530c82ce96e47797 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 31 Jul 2012 14:28:03 +0200
Subject: [PATCH] Should fix time label bug when creating a document see #4609

---
 main/document/document.php      | 7 +++----
 main/document/edit_document.php | 2 +-
 main/inc/lib/document.lib.php   | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/main/document/document.php b/main/document/document.php
index 9ed4faf46a..85c24d4438 100644
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -994,11 +994,10 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
         $row[] = '<span style="display:none;">' . $size . '</span>' . $invisibility_span_open . $display_size . $invisibility_span_close;
 
         // Last edit date
-        $last_edit_date = $document_data['lastedit_date'];
-        $last_edit_date = api_get_local_time($last_edit_date, null, date_default_timezone_get());
-        //$display_date = date_to_str_ago($last_edit_date).'<br /><span class="dropbox_date">'.api_format_date($last_edit_date).'</span>';
+        
+        $last_edit_date = api_get_local_time($document_data['lastedit_date']);        
         $display_date = date_to_str_ago($last_edit_date);
-        $row[] = $invisibility_span_open . $display_date . $invisibility_span_close;
+        $row[] = $invisibility_span_open.$display_date.$invisibility_span_close;
         // Admins get an edit column
 
         if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_folder(api_get_user_id(), $curdirpath, $session_id)) {
diff --git a/main/document/edit_document.php b/main/document/edit_document.php
index 6dfe7cbecc..2874a774a1 100644
--- a/main/document/edit_document.php
+++ b/main/document/edit_document.php
@@ -416,7 +416,7 @@ if ($owner_id == api_get_user_id() || api_is_platform_admin() || $is_allowed_to_
 		$metadata_link = '<a href="../metadata/index.php?eid='.urlencode('Document.'.$document_data['id']).'">'.get_lang('AddMetadata').'</a>';
 
 		//Updated on field
-		$last_edit_date = api_get_local_time($last_edit_date, null, date_default_timezone_get());
+		$last_edit_date = api_get_local_time($last_edit_date);
         $display_date = date_to_str_ago($last_edit_date).' <span class="dropbox_date">'.api_format_date($last_edit_date).'</span>';        
 		$form->addElement('static', null, get_lang('Metadata'), $metadata_link);
 		$form->addElement('static', null, get_lang('UpdatedOn'), $display_date);
diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php
index a1b607ab73..90547cfc79 100755
--- a/main/inc/lib/document.lib.php
+++ b/main/inc/lib/document.lib.php
@@ -2338,7 +2338,7 @@ class DocumentManager {
      * @param  int $to_group_id (to calculate group document space)
      * @return int total size
      */
-    function documents_total_space($to_group_id = '0') {
+    static function documents_total_space($to_group_id = '0') {
         $TABLE_ITEMPROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY);
         $TABLE_DOCUMENT 	= Database::get_course_table(TABLE_DOCUMENT);
 		$course_id 			= api_get_course_int_id();
@@ -2365,7 +2365,7 @@ class DocumentManager {
     /**
      *  Here we count 1 kilobyte = 1000 byte, 12 megabyte = 1000 kilobyte.
      */
-    function display_quota($course_quota, $already_consumed_space) {
+    static function display_quota($course_quota, $already_consumed_space) {
         $course_quota_m = round($course_quota / 1000000);
         $already_consumed_space_m = round($already_consumed_space / 1000000);
 
@@ -2416,7 +2416,7 @@ class DocumentManager {
      *
      *  Here we count 1 kilobyte = 1000 byte, 12 megabyte = 1000 kilobyte.
      */
-    function display_simple_quota($course_quota, $already_consumed_space) {
+    static function display_simple_quota($course_quota, $already_consumed_space) {
         $course_quota_m = round($course_quota / 1000000);
         $already_consumed_space_m = round($already_consumed_space / 1000000, 2);
         $percentage = $already_consumed_space / $course_quota * 100;