diff options
author | sgiehl <stefan@piwik.org> | 2015-07-06 00:32:43 +0300 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2015-09-25 21:07:48 +0300 |
commit | f60ad71df1765498f0c21789d5c55ab7218192e1 (patch) | |
tree | 1d51f1cb741974822e22ab01763e6ec9851c26e1 /core/Date.php | |
parent | 175b5bd50dbb8da7fb718f09a69d6dca986b20cb (diff) |
fixed tests
Diffstat (limited to 'core/Date.php')
-rw-r--r-- | core/Date.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/Date.php b/core/Date.php index 44c34ea0ba..a47fc03c73 100644 --- a/core/Date.php +++ b/core/Date.php @@ -614,7 +614,7 @@ class Date /** * Returns a localized date string using the given template. * The template should contain tags that will be replaced with localized date strings. - * + * * @param string $template eg. `"MMM y"` * @return string eg. `"Aug 2009"` */ @@ -642,6 +642,7 @@ class Date return $out; } + /** * Replaces legacy placeholders * @@ -722,11 +723,11 @@ class Date case "D": return 1 + (int)$this->toString('z'); // 1 - 366 case "F": - return (int)(((int)$this->toString('j')+6)/7); + return (int)(((int)$this->toString('j') + 6) / 7); // week in month case "w": - $weekDay=date('N',mktime(0,0,0,$this->toString('m'),1,$this->toString('y'))); - return floor(($weekDay+(int)$this->toString('m')-2)/7)+1; + $weekDay = date('N', mktime(0, 0, 0, $this->toString('m'), 1, $this->toString('y'))); + return floor(($weekDay + (int)$this->toString('m') - 2) / 7) + 1; // week in year case "W": return $this->toString('N'); |