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
=== modified file 'openid-teams.php'
--- openid-teams.php 2015-01-14 14:11:57 +0000
+++ openid-teams.php 2015-01-14 16:23:19 +0000
@@ -487,10 +487,12 @@
487 * @return array The amended extensions array to pass on487 * @return array The amended extensions array to pass on
488 */488 */
489function openid_teams_add_extenstion($extensions, $auth_request) {489function openid_teams_add_extenstion($extensions, $auth_request) {
490 $old_include_path = get_include_path();
490 set_include_path(dirname(__FILE__).'/../openid/' . PATH_SEPARATOR .491 set_include_path(dirname(__FILE__).'/../openid/' . PATH_SEPARATOR .
491 get_include_path());492 $old_include_path);
492 require_once 'teams-extension.php';493 require_once 'teams-extension.php';
493 restore_include_path();494 set_include_path($old_include_path);
495
494 $teams = get_teams_for_endpoint($auth_request->endpoint->server_url);496 $teams = get_teams_for_endpoint($auth_request->endpoint->server_url);
495497
496 if (openid_teams_is_restricted_access_enabled()) {498 if (openid_teams_is_restricted_access_enabled()) {
@@ -546,10 +548,11 @@
546 * @param string $identity_url548 * @param string $identity_url
547 */549 */
548function openid_teams_finish_auth($identity_url, $action) {550function openid_teams_finish_auth($identity_url, $action) {
551 $old_include_path = get_include_path();
549 set_include_path(dirname(__FILE__).'/../openid/' . PATH_SEPARATOR .552 set_include_path(dirname(__FILE__).'/../openid/' . PATH_SEPARATOR .
550 get_include_path());553 $old_include_path);
551 require_once 'teams-extension.php';554 require_once 'teams-extension.php';
552 restore_include_path();555 set_include_path($old_include_path);
553556
554 $response = openid_response();557 $response = openid_response();
555 if ($response->status == Auth_OpenID_SUCCESS) {558 if ($response->status == Auth_OpenID_SUCCESS) {

Subscribers

People subscribed via source and target branches