projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved import.
[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
555b6e1
..
6c4a422
100644
(file)
--- a/
WEB-INF/lib/form/Calendar.class.php
+++ b/
WEB-INF/lib/form/Calendar.class.php
@@
-207,7
+207,7
@@
class Calendar extends FormElement {
$str .= "</TR>\n";
}
$str .= "</TR>\n";
}
- $str .= "<tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->controlName."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get
Key
('label.today')."</a></td></tr>\n";
+ $str .= "<tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->controlName."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
$str .= "</table>\n";
$str .= "<input type=\"hidden\" name=\"$this->controlName\" value=\"$indate\">\n";
$str .= "</table>\n";
$str .= "<input type=\"hidden\" name=\"$this->controlName\" value=\"$indate\">\n";
@@
-260,7
+260,7
@@
class Calendar extends FormElement {
function _getActiveDates($start, $end) {
global $user;
function _getActiveDates($start, $end) {
global $user;
- $user_id = $user->get
Active
User();
+ $user_id = $user->getUser();
$table = ($this->highlight == 'expenses') ? 'tt_expense_items' : 'tt_log';
$table = ($this->highlight == 'expenses') ? 'tt_expense_items' : 'tt_log';