projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
type warning in dimension tags
[fa-stable.git]
/
includes
/
prefs
/
userprefs.inc
diff --git
a/includes/prefs/userprefs.inc
b/includes/prefs/userprefs.inc
index 32e92ce6df0fafd871ca75d1554c3d3d227aeecd..93f941807bc40143a16205270a8805eb6895259f 100644
(file)
--- a/
includes/prefs/userprefs.inc
+++ b/
includes/prefs/userprefs.inc
@@
-40,14
+40,19
@@
class user_prefs
{
if ($user == null) {
// set default values, used before login
{
if ($user == null) {
// set default values, used before login
- global $dflt_lang;
+ global $dflt_lang
, $dflt_date_sep, $dflt_date_fmt
;
+ $this->date_sep = $dflt_date_sep;
+ $this->date_format = $dflt_date_fmt;
+ $this->tho_sep = 0;
+ $this->dec_sep = 0;
+ $this->price_dec = 2;
$this->language = $dflt_lang;
$this->theme = 'default';
} else {
$this->language = $user["language"];
$this->language = $dflt_lang;
$this->theme = 'default';
} else {
$this->language = $user["language"];
-
language::
set_language($this->language);
+
$_SESSION['language']->
set_language($this->language);
$this->qty_dec = $user["qty_dec"];
$this->price_dec = $user["prices_dec"];
$this->qty_dec = $user["qty_dec"];
$this->price_dec = $user["prices_dec"];
@@
-67,8
+72,16
@@
class user_prefs
$this->rep_popup = $user["rep_popup"];
$this->query_size = $user["query_size"];
$this->graphic_links = $user["graphic_links"];
$this->rep_popup = $user["rep_popup"];
$this->query_size = $user["query_size"];
$this->graphic_links = $user["graphic_links"];
- $this->sticky_date = $user["sticky_doc_date"];
- $this->startup_tab = $user['startup_tab'];
+ if (isset($user["sticky_doc_date"]))
+ {
+ $this->sticky_date = $user["sticky_doc_date"];
+ $this->startup_tab = $user['startup_tab'];
+ }
+ else
+ {
+ $this->sticky_date = 0;
+ $this->startup_tab = "orders";
+ }
}
}
}
}