projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved ttTimeHelper::holidayMatch to allow partial wildcards in year.
[timetracker.git]
/
WEB-INF
/
lib
/
ttTimeHelper.class.php
diff --git
a/WEB-INF/lib/ttTimeHelper.class.php
b/WEB-INF/lib/ttTimeHelper.class.php
index
57790e2
..
f6d8b92
100644
(file)
--- a/
WEB-INF/lib/ttTimeHelper.class.php
+++ b/
WEB-INF/lib/ttTimeHelper.class.php
@@
-65,8
+65,10
@@
class ttTimeHelper {
$holiDateSpecArray = explode('-', $holiDateSpec);
// Check year.
$holiDateSpecArray = explode('-', $holiDateSpec);
// Check year.
- if ($dateArray[0] != $holiDateSpecArray[0] && $holiDateSpecArray[0] != '****') // **** means all years.
- return false;
+ for($i = 0; $i < 4; $i++) {
+ if ($dateArray[0][$i] != $holiDateSpecArray[0][$i] && $holiDateSpecArray[0][$i] != '*') // * means any digit matches
+ return false;
+ }
// Check month.
if ($dateArray[1] != $holiDateSpecArray[1])
return false;
// Check month.
if ($dateArray[1] != $holiDateSpecArray[1])
return false;