Merge branch 'post-bold2' into avoid-domino
[brisk.git] / web / Obj / brisk.phh
index 5238b13..8397e2c 100644 (file)
@@ -2787,15 +2787,22 @@ class Brisk
           do {
               if (!isset($cookie['sess'])
                   || (($user = $this->get_user($cookie['sess'], $idx)) == FALSE)) {
-
-                  $content = User::stream_fini($transp, $s_a_p->rndstr, TRUE);
+               // || (($user = $this->get_user($cookie['sess'], $idx)) == FALSE)
+               // || $user->page_id != $get['page_id']) {
+                  $content = "";
+                  // if ($user->page_id != $get['page_id']) {
+                  //     $content .= "OLD_PAGE";
+                  // }
+                  printf("\ndiscarded here\n");
+                  printf("Is Cookie %s\n", (isset($cookie['sess']) ? TRUE : FALSE));
+                  $content .= User::stream_fini($transp, $s_a_p->rndstr, TRUE);
 
                   $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
                   return TRUE;
 
                   break;
-              }
-              $this->sess_cur_set($user->sess);
+          }
+          $this->sess_cur_set($user->sess);
               // close a previous opened index_read_ifra socket, if exists
               if (($prev = $user->rd_socket_get()) != NULL) {
                   $s_a_p->socks_unset($user->rd_socket_get());