Changeset 7613

Show
Ignore:
Timestamp:
05/02/09 11:53:47 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7611 via svnmerge from
http://svn.freepbx.org/modules/branches/2.6

........

r7611 | p_lindheimer | 2009-05-02 09:19:46 -0700 (Sat, 02 May 2009) | 1 line


fixes #3652

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.5

    • Property svnmerge-integrated changed from /modules/branches/2.4:1-5852,5908 /modules/branches/2.6:1-7080,7132,7158-7174,7177,7179-7186,7191-7202,7204-7226,7228-7250,7252-7273,7279-7286,7289-7292,7294-7295,7297-7312,7317-7331,7333-7340,7411,7413,7415-7417,7419-7420,7423-7434,7438-7439,7441-7442,7444-7446,7458-7469,7553 to /modules/branches/2.4:1-5852,5908 /modules/branches/2.6:1-7080,7132,7158-7174,7177,7179-7186,7191-7202,7204-7226,7228-7250,7252-7273,7279-7286,7289-7292,7294-7295,7297-7312,7317-7331,7333-7340,7411,7413,7415-7417,7419-7420,7423-7434,7438-7439,7441-7442,7444-7446,7458-7469,7553,7611

  • modules/branches/2.5/dashboard/module.xml

    r7368 r7613  
    1818  </depends> 
    1919  <changelog> 
     20    *2.5.0.7* #3652 
    2021    *2.5.0.6* #3409, localization fixes, updates 
    2122    *2.5.0.5* #3404 correction 

  • modules/branches/2.5/dashboard/page.index.php

    r7342 r7613  
    153153    if ($seconds == 0) { 
    154154        return "0 "._("minutes"); 
     155    } elseif ($seconds < 60) { 
     156        return "$seconds "._("seconds"); 
    155157    } 
    156158