Permalink
Browse files

Merge branch 'annuh-master'

  • Loading branch information...
2 parents 337aff8 + 67f6d22 commit 0cffedb5c039a8925b25284dd7181e711d02016d @StorytellerCZ StorytellerCZ committed Oct 29, 2016
View
@@ -19,7 +19,8 @@
},
"require": {
"php": ">=5.2.0",
- "ext-curl": "*"
+ "ext-curl": "*",
+ "facebook/graph-sdk": "^5.4"
},
"autoload": {
"psr-0": {
@@ -168,7 +168,12 @@ function login() {
if ($this->id=="Live") {
$this->params["login_done"] = $HYBRID_AUTH_URL_BASE."live.php";
}
-
+
+ # Workaround to fix broken callback urls for the Facebook OAuth client
+ if ($this->adapter->useSafeUrls) {
+ $this->params['login_done'] = str_replace('hauth.done', 'hauth_done', $this->params['login_done']);
+ }
+
if (isset($this->params["hauth_return_to"])) {
Hybrid_Auth::storage()->set("hauth_session.{$this->id}.hauth_return_to", $this->params["hauth_return_to"]);
}
@@ -64,6 +64,9 @@
*/
public $compressed = false;
+ /** @var bool $useSafeUrls Enable this to replace '.' with '_' characters in the callback urls */
+ public $useSafeUrls = false;
+
/**
* Common providers adapter constructor
*
Oops, something went wrong.

0 comments on commit 0cffedb

Please sign in to comment.