Skip to content

Commit 08aecc8

Browse files
committed
fix: corrected merge issue
1 parent b1a0c21 commit 08aecc8

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

phpmyfaq/index.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,6 @@
6161
//
6262
require __DIR__ . '/src/Bootstrap.php';
6363

64-
//
65-
// Create Request + Response
66-
//
67-
$request = Request::createFromGlobals();
68-
$response = new Response();
69-
$response->headers->set('Content-Type', 'text/html');
70-
$csrfLogoutToken = Token::getInstance()->getTokenString('logout');
71-
72-
7364
//
7465
// Service Containers
7566
//
@@ -83,6 +74,15 @@
8374

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

77+
//
78+
// Create Request + Response
79+
//
80+
$request = Request::createFromGlobals();
81+
$response = new Response();
82+
$response->headers->set('Content-Type', 'text/html');
83+
$csrfLogoutToken = Token::getInstance($container->get('session'))->getTokenString('logout');
84+
85+
8686
//
8787
// Get language (default: english)
8888
//

0 commit comments

Comments
 (0)