summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMW <joasch@users.sourceforge.net>2007-11-28 19:14:42 +0000
committerMW <joasch@users.sourceforge.net>2007-11-28 19:14:42 +0000
commitcbb76b640d7e9f772ac4d06696b7a156b5c40cf7 (patch)
treec4494b38f7fca30928f39b02f5473089f097e065
parenta4f6776b6ba257c2a1acc87d7c3800a89c408fb4 (diff)
downloadusers-cbb76b640d7e9f772ac4d06696b7a156b5c40cf7.tar.gz
users-cbb76b640d7e9f772ac4d06696b7a156b5c40cf7.tar.bz2
users-cbb76b640d7e9f772ac4d06696b7a156b5c40cf7.zip
restore accidently removed code and give it a better comment not to be misunderstood.
-rw-r--r--BitUser.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/BitUser.php b/BitUser.php
index 8bd7981..5f810da 100644
--- a/BitUser.php
+++ b/BitUser.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.164 2007/11/15 22:56:11 joasch Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.165 2007/11/28 19:14:42 joasch Exp $
*
* Lib for user administration, groups and permissions
* This lib uses pear so the constructor requieres
@@ -12,7 +12,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: BitUser.php,v 1.164 2007/11/15 22:56:11 joasch Exp $
+ * $Id: BitUser.php,v 1.165 2007/11/28 19:14:42 joasch Exp $
* @package users
*/
@@ -40,7 +40,7 @@ define("ACCOUNT_DISABLED", -6);
* Class that holds all information for a given user
*
* @author spider <spider@steelsun.com>
- * @version $Revision: 1.164 $
+ * @version $Revision: 1.165 $
* @package users
* @subpackage BitUser
*/
@@ -295,6 +295,11 @@ class BitUser extends LibertyAttachable {
trim_array( $pParamHash );
+ // DO NOT REMOVE - to allow specific setting of the user_id during the first store.
+ // used by ROOT_USER_ID or ANONYMOUS_USER_ID during install.
+ if( @$this->verifyId( $pParamHash['user_id'] ) ) {
+ $pParamHash['user_store']['user_id'] = $pParamHash['user_id'];
+ }
if( !empty( $pParamHash['login'] ) ) {
if( $this->userExists( array( 'login' => $pParamHash['login'] ) ) ) {
$this->mErrors['login'] = 'The username "'.$pParamHash['login'].'" is already in use';