Skip to content

Commit

Permalink
fix: corrected merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
thorsten committed Jan 9, 2025
1 parent b1a0c21 commit 08aecc8
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions phpmyfaq/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,6 @@
//
require __DIR__ . '/src/Bootstrap.php';

//
// Create Request + Response
//
$request = Request::createFromGlobals();
$response = new Response();
$response->headers->set('Content-Type', 'text/html');
$csrfLogoutToken = Token::getInstance()->getTokenString('logout');


//
// Service Containers
//
Expand All @@ -83,6 +74,15 @@

$faqConfig = $container->get('phpmyfaq.configuration');

//
// Create Request + Response
//
$request = Request::createFromGlobals();
$response = new Response();
$response->headers->set('Content-Type', 'text/html');
$csrfLogoutToken = Token::getInstance($container->get('session'))->getTokenString('logout');


//
// Get language (default: english)
//
Expand Down

0 comments on commit 08aecc8

Please sign in to comment.