GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber
2010-02-12 15:32:12 -08:00
parent 122c8677b7 d6f1df8b76
commit f8a459a88a
6 changed files with 152 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/util.php
View File

@@ -367,7 +367,8 @@ function common_current_user()
if ($_cur === false) {
if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) {
if (isset($_COOKIE[session_name()]) || isset($_GET[session_name()])
|| (isset($_SESSION['userid']) && $_SESSION['userid'])) {
common_ensure_session();
$id = isset($_SESSION['userid']) ? $_SESSION['userid'] : false;
if ($id) {