aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-11-14 17:36:12 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-11-14 17:36:12 +0100
commitace66f861a38e2368a1634a8b67c53906552499e (patch)
treeb5b96b7455f125b8ea495b7260e0458686641277
parent692fbf732f46eac4e673d0e317cd145eb446c999 (diff)
parent23e2f920f5ed52cf9b354f61fcff548a03335ecc (diff)
downloadforums-ace66f861a38e2368a1634a8b67c53906552499e.tar
forums-ace66f861a38e2368a1634a8b67c53906552499e.tar.gz
forums-ace66f861a38e2368a1634a8b67c53906552499e.tar.bz2
forums-ace66f861a38e2368a1634a8b67c53906552499e.tar.xz
forums-ace66f861a38e2368a1634a8b67c53906552499e.zip
Merge remote-tracking branch 'Marc/ticket/12018' into develop
* Marc/ticket/12018: [ticket/12018] Use path_helper for admin style CSS in sql report
-rw-r--r--phpBB/phpbb/db/driver/driver.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php
index 58d0b61519..d721ed2eb7 100644
--- a/phpBB/phpbb/db/driver/driver.php
+++ b/phpBB/phpbb/db/driver/driver.php
@@ -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">