summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-31 15:27:58 -0500
committerEvan Prodromou <evan@status.net>2010-01-31 15:27:58 -0500
commit779204b194447397d0770d96e291d9491fd731b9 (patch)
treed0bfe36cc2b743fce8507e8cf6851467ccec8789 /lib/util.php
parentbd5278302574ae3af87f09e0d8191c95ab93582a (diff)
parent81087e45c5b797028e90181459e4c673cd7be278 (diff)
Merge branch 'testing' into 0.9.x
Conflicts: actions/apioauthauthorize.php
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index 6c9f6316a..ed1a62385 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -178,7 +178,6 @@ function common_ensure_session()
}
if (isset($id)) {
session_id($id);
- setcookie(session_name(), $id);
}
@session_start();
if (!isset($_SESSION['started'])) {