summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-01-18 21:08:56 +0000
committerZach Copley <zach@controlyourself.ca>2009-01-18 21:08:56 +0000
commitaea172bee0f2ffdda55cc77016dd609481d7dfee (patch)
treed33af22d48db168c9c68edda45bf822bdfdd2d12 /actions
parent8fdf888edbd74e707d2698c7625dc90b22f0aeef (diff)
trac750 Removed psychotic FB redirect hack. Found a better way with document.setLocation()
Diffstat (limited to 'actions')
-rw-r--r--actions/facebooksettings.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 372c40c28..b678f19a1 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -67,19 +67,19 @@ class FacebooksettingsAction extends FacebookAction
$flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
$this->showHeader('Settings', $msg, $success);
-
- common_element('form', array('id' => 'redirect_form',
- 'style' => 'display: none;'));
common_element_start('p');
+
+ // Figure what the URL of our app is.
+ $app_props = $facebook->api_client->Admin_getAppProperties(array('canvas_name'));
+ $app_url = 'http://apps.facebook.com/' . $app_props['canvas_name'] . '/settings.php';
+
common_element_start('fb:prompt-permission', array('perms' => 'status_update',
- 'next_fbjs' => 'redirectSettings()'));
+ 'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
common_element('h2', null, _('Allow Identi.ca to update my Facebook status'));
common_element_end('fb:prompt-permission');
common_element_end('p');
-
-
if ($facebook->api_client->users_hasAppPermission('status_update')) {
common_element_start('form', array('method' => 'post',