tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-06-20 Hirofumi Kosaka <kosaka@rworks.jp> 

* include/functions.php: Changed ambiguous time representation
	"MM:SS minutes", that can read 'MM hours SS minute', to 
	"MM minutes SS seconds".
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6603 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2012-06-20 03:34:57 +00:00
parent 50fc62147b
commit df60fb5c34
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-06-20 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions.php: Changed ambiguous time representation
"MM:SS minutes", that can read 'MM hours SS minute', to
"MM minutes SS seconds".
Merged from 4.0.2
2012-06-19 Sergio Martin <sergio.martin@artica.es> 2012-06-19 Sergio Martin <sergio.martin@artica.es>
* general/header.php: Add hint to explain the use of * general/header.php: Add hint to explain the use of

2
pandora_console/include/functions.php
View File

@ -509,7 +509,7 @@ function human_time_description_raw ($seconds, $exactly = false, $units = 'large
if ($seconds == 0) if ($seconds == 0)
return $minutes.' ' . $minutesString; return $minutes.' ' . $minutesString;
$seconds = sprintf ("%02d", $seconds); $seconds = sprintf ("%02d", $seconds);
return $minutes.':'.$seconds.' ' . $minutesString; return $minutes.' '. $minutesString . ' ' .$seconds.' ' . $secondsString;
} }
if ($seconds < 86400) if ($seconds < 86400)