diff options
author | Brion Vibber <brion@pobox.com> | 2010-09-27 12:34:01 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-09-28 07:44:25 -0700 |
commit | c2de0a74072433ad0cc356694a03971e890ebb76 (patch) | |
tree | 78132b3d9f8327e9b0a69fdfbc2eb2f31b804947 /plugins/YammerImport/actions/yammeradminpanel.php | |
parent | a57d67c91548482c74e07034c7717fa4e1057d3b (diff) |
Ok, got the AJAX clicky-throughs working for yammer auth (if app is already registered), but needs prettification. Yammer ignores callback URLs unless they're pre-registered with the app, and this apparently requires manual intervention to become a 'trusted' app, you don't get it on those you register yourself. Sigh. Also can't use an iframe since it breaks out of the frame (fair 'nuff)
Diffstat (limited to 'plugins/YammerImport/actions/yammeradminpanel.php')
-rw-r--r-- | plugins/YammerImport/actions/yammeradminpanel.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/YammerImport/actions/yammeradminpanel.php b/plugins/YammerImport/actions/yammeradminpanel.php index 71651cdf5..fdf7a084f 100644 --- a/plugins/YammerImport/actions/yammeradminpanel.php +++ b/plugins/YammerImport/actions/yammeradminpanel.php @@ -76,7 +76,7 @@ class YammeradminpanelAction extends AdminPanelAction return $this->showAjaxForm($form); } else if ($this->verify_token) { $this->runner->saveAuthToken($this->verify_token); - $form = new YammerAuthProgressForm(); + $form = new YammerProgressForm($this, $this->runner); return $this->showAjaxForm($form); } else { throw new ClientException('Invalid POST'); |