gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #15437 - Fixed url.php crashing because it's not loading the DatabaseInterface service

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-08-30 23:59:56 +02:00
commit e844368b46
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
url.php
View File

@ -10,6 +10,7 @@ declare(strict_types=1);
use PhpMyAdmin\Core; use PhpMyAdmin\Core;
use PhpMyAdmin\Response; use PhpMyAdmin\Response;
use PhpMyAdmin\Sanitize; use PhpMyAdmin\Sanitize;
use PhpMyAdmin\DatabaseInterface;
if (! defined('ROOT_PATH')) { if (! defined('ROOT_PATH')) {
define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR); define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@ -21,6 +22,9 @@ if (! defined('ROOT_PATH')) {
define('PMA_MINIMUM_COMMON', true); define('PMA_MINIMUM_COMMON', true);
require_once ROOT_PATH . 'libraries/common.inc.php'; require_once ROOT_PATH . 'libraries/common.inc.php';
// Load database service because services.yaml is not available here
$containerBuilder->set(DatabaseInterface::class, DatabaseInterface::load());
// Only output the http headers // Only output the http headers
$response = Response::getInstance(); $response = Response::getInstance();
$response->getHeader()->sendHttpHeaders(); $response->getHeader()->sendHttpHeaders();