Changeset 53
- Timestamp:
- 05/24/07 15:30:37 (2 years ago)
- Files:
-
- trunk/wp-infocard/pw-claimtypes.php (modified) (1 diff)
- trunk/wp-infocard/pwlib/login/infocard-submit.php (modified) (2 diffs)
- trunk/wp-infocard/wp/login/infocard-login.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/wp-infocard/pw-claimtypes.php
r44 r53 57 57 'return $' . 'claimslist[\'privatepersonalidentifier\']->token_value;' ); 58 58 59 <<<<<<< .mine60 59 $datamap['user_login'] = new pw_mapping( 61 60 'user_login', 62 61 'Login ID', 63 62 PW_TABLE_PREFIX . 'users', 64 =======65 $datamap['user_login'] = new pw_mapping(66 'user_login',67 'Login ID',68 PW_TABLE_PREFIX . '_users',69 >>>>>>> .r4270 63 'return pw_userdata::getLoginID();', 71 64 'Calls out to the getLoginID function in pw_userdata' ); trunk/wp-infocard/pwlib/login/infocard-submit.php
r42 r53 25 25 include_once( dirname(__FILE__) . '/../../' . PW_PLUGIN . '/utils.pw.php'); 26 26 include_once( dirname(__FILE__) . '/../../' . PW_PLUGIN . '/login/class.infocard-login.php'); 27 include_once( 'login.pwlib.php'); 27 28 28 29 // this only happens in the case of account validation. … … 45 46 <form name="ctl00" id="ctl00" method="post" action="<?php InfocardLogin::printICPostDestination(); ?>"> 46 47 <?php 47 InfocardLogin::printIdentitySelectorTrigger();48 pw_login::printIdentitySelectorTrigger(); 48 49 InfocardLogin::printHiddenClickback($clickback); 49 50 trunk/wp-infocard/wp/login/infocard-login.php
r43 r53 13 13 include_once( dirname(__FILE__) . '/../utils.pw.php'); 14 14 include_once('class.infocard-login.php'); 15 include_once( dirname(__FILE__) . '/../../pwlib/login/login.pwlib.php'); 15 16 ?> 16 17
