cvs: pear /LiveUser LiveUser.php
| From: | Lukas Smith | Date: | Thu, 10 Nov 2005 17:52:02 +0000 |
| Subject: | cvs: pear /LiveUser LiveUser.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-36206@lists.php.net to get a copy of this message | ||
lsmith Thu Nov 10 12:52:02 2005 EDT
Modified files:
/pear/LiveUser LiveUser.php
Log:
- fix for calling singleton without a signature string (bug #5905)
http://cvs.php.net/diff.php/pear/LiveUser/LiveUser.php?r1=1.120&r2=1.121&ty=u
Index: pear/LiveUser/LiveUser.php
diff -u pear/LiveUser/LiveUser.php:1.120 pear/LiveUser/LiveUser.php:1.121
--- pear/LiveUser/LiveUser.php:1.120 Tue Nov 8 10:26:26 2005
+++ pear/LiveUser/LiveUser.php Thu Nov 10 12:51:59 2005
@@ -40,7 +40,7 @@
* @author Bjoern Kraus <krausbn@php.net>
* @copyright 2002-2005 Markus Wolff
* @license http://www.gnu.org/licenses/lgpl.txt
- * @version CVS: $Id: LiveUser.php,v 1.120 2005/11/08 15:26:26 arnaud Exp $
+ * @version CVS: $Id: LiveUser.php,v 1.121 2005/11/10 17:51:59 lsmith Exp $
* @link http://pear.php.net/LiveUser
*/
@@ -481,11 +481,13 @@
if (is_null($signature)) {
if (empty($instances)) {
- $signature = uniqid();
+ $signature = uniqid('LU');
} else {
$signature = key($instances);
}
- } elseif (!array_key_exists($signature, $instances)) {
+ }
+
+ if (!array_key_exists($signature, $instances)) {
$instances[$signature] =& LiveUser::factory($conf);
}