Created
May 3, 2011 15:38
-
-
Save aaronstaves/953561 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<<<<<<< HEAD | |
// try loading session from signed_request in $_REQUEST | |
$signedRequest = $this->getSignedRequest(); | |
if ($signedRequest) { | |
// sig is good, use the signedRequest | |
$session = $this->createSessionFromSignedRequest($signedRequest); | |
} | |
======= | |
// try loading session from signed_request in $_REQUEST | |
$signedRequest = $this->getSignedRequest(); | |
error_log(json_encode($signedRequest)); | |
if ($signedRequest) { | |
error_log('signed request'); | |
if (!isset($signedRequest['user_id'])) { | |
error_log('no user id in request, null'); | |
return null; | |
} | |
// sig is good, use the signedRequest | |
error_log('create session from request'); | |
$session = $this->createSessionFromSignedRequest($signedRequest); | |
} | |
>>>>>>> ede1945... added fields to redemption reports |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment