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: 31
Proposed branch: lp:~nick-moffitt/wordpress-teams-integration/fix-openid-finish-auth-hook
Merge into: lp:wordpress-teams-integration
Diff against target: 32 lines (+7/-4)
1 file modified
openid-teams.php (+7/-4)
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+246462@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 2015-01-14 14:11:57 +0000
3+++ openid-teams.php 2015-01-14 16:23:19 +0000
4@@ -487,10 +487,12 @@
5 * @return array The amended extensions array to pass on
6 */
7 function openid_teams_add_extenstion($extensions, $auth_request) {
8+ $old_include_path = get_include_path();
9 set_include_path(dirname(__FILE__).'/../openid/' . PATH_SEPARATOR .
10- get_include_path());
11+ $old_include_path);
12 require_once 'teams-extension.php';
13- restore_include_path();
14+ set_include_path($old_include_path);
15+
16 $teams = get_teams_for_endpoint($auth_request->endpoint->server_url);
17
18 if (openid_teams_is_restricted_access_enabled()) {
19@@ -546,10 +548,11 @@
20 * @param string $identity_url
21 */
22 function openid_teams_finish_auth($identity_url, $action) {
23+ $old_include_path = get_include_path();
24 set_include_path(dirname(__FILE__).'/../openid/' . PATH_SEPARATOR .
25- get_include_path());
26+ $old_include_path);
27 require_once 'teams-extension.php';
28- restore_include_path();
29+ set_include_path($old_include_path);
30
31 $response = openid_response();
32 if ($response->status == Auth_OpenID_SUCCESS) {

Subscribers

People subscribed via source and target branches