Merge branch 'saas-dev' into soundcloud

This commit is contained in:
Duncan Sommerville 2015-09-08 16:15:24 -04:00
commit d18d52a37a

View file

@ -49,7 +49,7 @@ abstract class ThirdPartyController extends Zend_Controller_Action {
public function deauthorizeAction() { public function deauthorizeAction() {
$function = $this->_SERVICE_TOKEN_ACCESSOR; $function = $this->_SERVICE_TOKEN_ACCESSOR;
Application_Model_Preference::$function(""); Application_Model_Preference::$function("");
header('Location: ' . $this->_baseUrl . 'Preference'); // Redirect back to the Preference page header('Location: ' . $this->_baseUrl . 'preference'); // Redirect back to the preference page
} }
/** /**
@ -61,7 +61,7 @@ abstract class ThirdPartyController extends Zend_Controller_Action {
public function redirectAction() { public function redirectAction() {
$code = $_GET['code']; $code = $_GET['code'];
$this->_service->requestNewAccessToken($code); $this->_service->requestNewAccessToken($code);
header('Location: ' . $this->_baseUrl . 'Preference'); // Redirect back to the Preference page header('Location: ' . $this->_baseUrl . 'preference'); // Redirect back to the preference page
} }
/** /**