Merge branch 'testing' into 0.9.x

Conflicts: actions/apioauthauthorize.php
2010-01-31 15:27:58 -05:00
parent bd52783025 81087e45c5
commit 779204b194
47 changed files with 2864 additions and 350 deletions
--- 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'])) {