Merging fixes for strict standards errors. Closes #44

This commit is contained in:
Dan Cryer 2013-05-17 16:24:17 +01:00
commit b9415316d4
3 changed files with 4 additions and 5 deletions

View file

@ -107,8 +107,6 @@ class ProjectController extends b8\Controller
*/
public function add()
{
$_SESSION['github_token'] = isset($_SESSION['github_token']) ? $_SESSION['github_token'] : null;
if (!Registry::getInstance()->get('user')->getIsAdmin()) {
throw new \Exception('You do not have permission to do that.');
}
@ -175,9 +173,11 @@ class ProjectController extends b8\Controller
*/
protected function handleGithubResponse()
{
$github = \b8\Registry::getInstance()->get('github_app');
$github = \b8\Registry::getInstance()->get('github_app');
$code = $this->getParam('code', null);
$_SESSION['github_token'] = null;
if (!is_null($code)) {
$http = new \b8\HttpClient();
$url = 'https://github.com/login/oauth/access_token';