projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version updated to 5.4.2
[brisk.git]
/
web
/
Obj
/
user.phh
diff --git
a/web/Obj/user.phh
b/web/Obj/user.phh
index
fde4a57
..
000ad97
100644
(file)
--- a/
web/Obj/user.phh
+++ b/
web/Obj/user.phh
@@
-707,7
+707,8
@@
class User {
}
}
}
}
}
}
- if ($G_with_splash &&
+ // if ($G_with_splash &&
+ if ($this->is_auth() && (! $this->is_appr()) && $G_with_splash &&
($splashdate < $curtime - $G_splash_interval ||
$splashdate > $curtime)) {
$is_super = $this->flags & USER_FLAG_TY_SUPER;
($splashdate < $curtime - $G_splash_interval ||
$splashdate > $curtime)) {
$is_super = $this->flags & USER_FLAG_TY_SUPER;
@@
-923,6
+924,12
@@
function chunked_fini()
} // end class User
} // end class User
+define('USERSNET_FRIEND_BLACK', 1);
+define('USERSNET_FRIEND_UNKNOWN', 2);
+define('USERSNET_FRIEND_TEST', 3);
+define('USERSNET_FRIEND_FRIEND', 4);
+define('USERSNET_FRIEND_BFF', 5);
+
if (!isset($__usersnet_friend_map)) {
$__usersnet_friend_map = array("black", "unknown", "test", "friend", "bff");
}
if (!isset($__usersnet_friend_map)) {
$__usersnet_friend_map = array("black", "unknown", "test", "friend", "bff");
}