Wordpress Teams Integration

Merge lp:~nick-moffitt/wordpress-teams-integration/fix-openid-finish-auth-hook into lp:wordpress-teams-integration

  1. fix-openid-finish-auth-hook
  2. Merge into trunk
Proposed by Nick Moffitt
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
Reviewer Review Type Date Requested Status
Jacek Nykis Pending
Review via email: mp+246422@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 add_action('admin_menu', 'openid_teams_admin_panels');
6 add_filter('openid_auth_request_extensions',
7 'openid_teams_add_extenstion', 10, 2);
8-add_action('openid_finish_auth', 'openid_teams_finish_auth');
9+add_action('openid_finish_auth', 'openid_teams_finish_auth', 9, 2);
10 add_action('wp_login', 'openid_teams_assign_on_login');
11 add_action('wp_logout', 'openid_teams_assign_on_logout');
12 /**
13@@ -545,7 +545,7 @@
14 *
15 * @param string $identity_url
16 */
17-function openid_teams_finish_auth($identity_url) {
18+function openid_teams_finish_auth($identity_url, $action) {
19 set_include_path(dirname(__FILE__).'/../openid/' . PATH_SEPARATOR .
20 get_include_path());
21 require_once 'teams-extension.php';

Subscribers

People subscribed via source and target branches