From: Hypolite Petovan <ben.lort@gmail.com>
Date: Sat, 29 Oct 2016 02:26:38 +0000 (-0400)
Subject: Merge branch 'develop' into improvement/ping-performance
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8e50254bb994592b28e04299a4bfc11f4c8c979a;p=friendica.git

Merge branch 'develop' into improvement/ping-performance
---

8e50254bb994592b28e04299a4bfc11f4c8c979a
diff --cc include/session.php
index 5cf4bcc9cf,c69a402317..763b05f481
--- a/include/session.php
+++ b/include/session.php
@@@ -23,22 -36,10 +36,23 @@@ function ref_session_read($id) 
  	} else {
  		logger("no data for session $id", LOGGER_TRACE);
  	}
+ 
  	return '';
- }}
+ }
  
 +/**
 + * @brief Standard PHP session write callback
 + *
 + * This callback updates the DB-stored session data and/or the expiration depending
 + * on the case. Uses the $session_expire global for existing session, 5 minutes
 + * for newly created session.
 + *
 + * @global bool $session_exists Whether a session with the given id already exists
 + * @global int $session_expire Session expiration delay in seconds
 + * @param string $id Session ID with format: [a-z0-9]{26}
 + * @param string $data Serialized session data
 + * @return boolean Returns false if parameters are missing, true otherwise
 + */
  function ref_session_write($id, $data) {
  	global $session_exists, $session_expire;