cvs: pear /HTTP_Session Session.php

troehr Sat May 12 11:07:18 2007 UTC

Modified files:
/pear/HTTP_Session Session.php
Log:
Implemented request #11022

http://cvs.php.net/viewvc.cgi/pear/H...&diff_format=u
Index: pear/HTTP_Session/Session.php
diff -u pear/HTTP_Session/Session.php:1.12 pear/HTTP_Session/Session.php:1.13
--- pear/HTTP_Session/Session.php:1.12 Sat Dec 16 13:37:12 2006
+++ pear/HTTP_Session/Session.php Sat May 12 11:07:18 2007
@@ -27,7 +27,7 @@
* @author Torsten Roehr <torsten.roehr@gmx.de>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: Session.php,v 1.12 2006/12/16 13:37:12 troehr Exp $
+ * @version CVS: $Id: Session.php,v 1.13 2007/05/12 11:07:18 troehr Exp $
* @link http://pear.php.net/package/HTTP_Session
* @since File available since Release 0.4.0
*/
@@ -150,7 +150,9 @@
function start($name = 'SessionID', $id = null)
{
HTTP_Session::name($name);
- if (is_null(HTTP_Session::detectID())) {
+ if ($id) {
+ HTTP_Session::id($id);
+ } elseif (is_null(HTTP_Session::detectID())) {
HTTP_Session::id($id ? $id : uniqid(dechex(rand())));
}
session_start();