clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment

Browse Source 
Conflicts:
	include/ostatus.php
This commit is contained in:
Michael Vogel
2015-12-22 11:25:37 +01:00
parent 7ee1eb2978 71255d04a2
commit 307beb47fd
57 changed files with 13448 additions and 11711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/session.php
View File

@@ -79,7 +79,7 @@ ini_set('session.gc_probability', $gc_probability);
ini_set('session.use_only_cookies', 1);
ini_set('session.cookie_httponly', 1);
session_set_save_handler ('ref_session_open', 'ref_session_close',
'ref_session_read', 'ref_session_write',
'ref_session_destroy', 'ref_session_gc');
if (!get_config('system', 'disable_database_session'))
session_set_save_handler('ref_session_open', 'ref_session_close',
'ref_session_read', 'ref_session_write',
'ref_session_destroy', 'ref_session_gc');