Merge remote-tracking branch 'Marc/ticket/12018' into develop

* Marc/ticket/12018:
  [ticket/12018] Use path_helper for admin style CSS in sql report
This commit is contained in:
Joas Schilling 2013-11-14 17:36:12 +01:00
commit ace66f861a

View file

@ -816,7 +816,7 @@ class driver
*/
function sql_report($mode, $query = '')
{
global $cache, $starttime, $phpbb_root_path, $phpbb_admin_path, $user;
global $cache, $starttime, $phpbb_root_path, $phpbb_path_helper, $user;
global $request;
if (is_object($request) && !$request->variable('explain', false))
@ -846,7 +846,7 @@ class driver
<head>
<meta charset="utf-8">
<title>SQL Report</title>
<link href="' . htmlspecialchars($phpbb_admin_path) . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />
<link href="' . htmlspecialchars($phpbb_path_helper->update_web_root_path($phpbb_root_path) . $phpbb_path_helper->get_adm_relative_path()) . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />
</head>
<body id="errorpage">
<div id="wrap">