projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'avidenic-master'
[timetracker.git]
/
initialize.php
diff --git
a/initialize.php
b/initialize.php
index
2cb0f5b
..
ded539c
100644
(file)
--- a/
initialize.php
+++ b/
initialize.php
@@
-152,8
+152,8
@@
import('html.HttpRequest');
$request = new ttHttpRequest();
import('form.ActionErrors');
$request = new ttHttpRequest();
import('form.ActionErrors');
-$err = new ActionErrors();
-$m
essages = new ActionErrors();
+$err = new ActionErrors();
// Error messages for user.
+$m
sg = new ActionErrors(); // Notification messages (not errrors) for user.
// Create an instance of ttUser class. This gets us most of user details.
import('ttUser');
// Create an instance of ttUser class. This gets us most of user details.
import('ttUser');
@@
-193,8
+193,8
@@
$GLOBALS['USER'] = &$user;
// Assign things for smarty to use in template files.
$smarty->assign('i18n', $i18n->keys);
// Assign things for smarty to use in template files.
$smarty->assign('i18n', $i18n->keys);
-$smarty->assign('err
ors
', $err);
-$smarty->assign('m
essages', $messages
);
+$smarty->assign('err', $err);
+$smarty->assign('m
sg', $msg
);
// TODO: move this code out of here to the files that use it.
// TODO: move this code out of here to the files that use it.