1
=== modified file 'openid-teams.php'
2
--- openid-teams.php	2011-07-29 20:03:35 +0000
3
+++ openid-teams.php	2015-01-14 14:14:04 +0000
4
@@ -30,7 +30,7 @@
5
30
add_action('admin_menu', 'openid_teams_admin_panels');
30
add_action('admin_menu', 'openid_teams_admin_panels');
6
31
add_filter('openid_auth_request_extensions',
31
add_filter('openid_auth_request_extensions',
7
32
           'openid_teams_add_extenstion', 10, 2);
32
           'openid_teams_add_extenstion', 10, 2);
9
33
add_action('openid_finish_auth', 'openid_teams_finish_auth');
33
add_action('openid_finish_auth', 'openid_teams_finish_auth', 9, 2);
10
34
add_action('wp_login', 'openid_teams_assign_on_login');
34
add_action('wp_login', 'openid_teams_assign_on_login');
11
35
add_action('wp_logout', 'openid_teams_assign_on_logout');
35
add_action('wp_logout', 'openid_teams_assign_on_logout');
12
36
/**
36
/**
13
@@ -545,7 +545,7 @@
14
545
 *
545
 *
15
546
 * @param string $identity_url
546
 * @param string $identity_url
16
547
 */
547
 */
18
548
function openid_teams_finish_auth($identity_url) {
548
function openid_teams_finish_auth($identity_url, $action) {
19
549
  set_include_path(dirname(__FILE__).'/../openid/' . PATH_SEPARATOR .
549
  set_include_path(dirname(__FILE__).'/../openid/' . PATH_SEPARATOR .
20
550
                   get_include_path());
550
                   get_include_path());
21
551
  require_once 'teams-extension.php';
551
  require_once 'teams-extension.php';
Status:	Merged
Merged at revision:	30
Proposed branch:	lp:~nick-moffitt/wordpress-teams-integration/fix-openid-finish-auth-hook
Merge into:	lp:wordpress-teams-integration
Diff against target:	21 lines (+2/-2) 1 file modified openid-teams.php (+2/-2)
To merge this branch:	bzr merge lp:~nick-moffitt/wordpress-teams-integration/fix-openid-finish-auth-hook
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jacek Nykis		2015-01-14	Pending
Review via email: mp+246422@code.launchpad.net
1	=== modified file 'openid-teams.php'
2	--- openid-teams.php 2011-07-29 20:03:35 +0000
3	+++ openid-teams.php 2015-01-14 14:14:04 +0000
4	@@ -30,7 +30,7 @@
5	30	add_action('admin_menu', 'openid_teams_admin_panels');	30	add_action('admin_menu', 'openid_teams_admin_panels');
6	31	add_filter('openid_auth_request_extensions',	31	add_filter('openid_auth_request_extensions',
7	32	'openid_teams_add_extenstion', 10, 2);	32	'openid_teams_add_extenstion', 10, 2);
9	33	add_action('openid_finish_auth', 'openid_teams_finish_auth');	33	add_action('openid_finish_auth', 'openid_teams_finish_auth', 9, 2);
10	34	add_action('wp_login', 'openid_teams_assign_on_login');	34	add_action('wp_login', 'openid_teams_assign_on_login');
11	35	add_action('wp_logout', 'openid_teams_assign_on_logout');	35	add_action('wp_logout', 'openid_teams_assign_on_logout');
12	36	/**	36	/**
13	@@ -545,7 +545,7 @@
14	545	*	545	*
15	546	* @param string $identity_url	546	* @param string $identity_url
16	547	*/	547	*/
18	548	function openid_teams_finish_auth($identity_url) {	548	function openid_teams_finish_auth($identity_url, $action) {
19	549	set_include_path(dirname(__FILE__).'/../openid/' . PATH_SEPARATOR .	549	set_include_path(dirname(__FILE__).'/../openid/' . PATH_SEPARATOR .
20	550	get_include_path());	550	get_include_path());
21	551	require_once 'teams-extension.php';	551	require_once 'teams-extension.php';