Merge remote-tracking branch 'origin/master' into nginx

[brisk.git] / web / Obj / user.phh

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index fde4a57..c972404 100644 (file)
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -830,7 +830,7 @@ function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $p
     
     $this->rd_data_set($curtime, $transp, $enc, $stat, $subst, $step, $from);
     
-    $ret = $this->rd_transp->init($enc, $header, &$header_out, $init_string, self::base_get(), $this->rd_scristp);
+    $ret = $this->rd_transp->init($enc, $header, $header_out, $init_string, self::base_get(), $this->rd_scristp);
 
     if ($ret === FALSE) {
         return FALSE;
@@ -923,6 +923,12 @@ function chunked_fini()
 
 } // 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");
 }