Merge https://github.com/friendica/red into zpull

2013-12-23 12:01:53 -08:00
parent 45a4c649ed ea31573e26
commit 4517bdcff1
5 changed files with 3090 additions and 3346 deletions
@@ -7,7 +7,7 @@ function xref_init(&$a) {
 	// Cookie lasts 24 hours to survive a browser restart.  Contains no personal
 	// information at all - just somebody else's xchan.
 	$referrer = argv(1);
-	$expire=time()+60*60*24;
+	$expire=time()+60*60*2;
 	$path = 'xref';
 	setcookie($path, $referrer, $expire, "/"); 
 	$url = '';