projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work in progress on roles. Changed default rights assigned to roles.
[timetracker.git]
/
WEB-INF
/
lib
/
form
/
Calendar.class.php
diff --git
a/WEB-INF/lib/form/Calendar.class.php
b/WEB-INF/lib/form/Calendar.class.php
index
ab2dcf5
..
555b6e1
100644
(file)
--- a/
WEB-INF/lib/form/Calendar.class.php
+++ b/
WEB-INF/lib/form/Calendar.class.php
@@
-57,8
+57,9
@@
class Calendar extends FormElement {
$this->highlight = $highlight;
}
$this->highlight = $highlight;
}
- function localize(
$i18n
) {
+ function localize() {
global $user;
global $user;
+ global $i18n;
$this->mMonthNames = $i18n->monthNames;
$this->mWeekDayShortNames = $i18n->weekdayShortNames;
$this->mMonthNames = $i18n->monthNames;
$this->mWeekDayShortNames = $i18n->weekdayShortNames;
@@
-171,7
+172,9
@@
class Calendar extends FormElement {
}
// holidays
}
// holidays
- if ($this->showHolidays) {
+ //if ($this->showHolidays) {
+ global $user;
+ if ($user->show_holidays) {
foreach ($this->holidays as $day) {
if($day == $date) {
$stl_cell = ' class="CalendarDayHoliday"';
foreach ($this->holidays as $day) {
if($day == $date) {
$stl_cell = ' class="CalendarDayHoliday"';