From 0e89c8517814827e04b50ca2904676b20d5f5211 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 9 Jul 2018 09:55:14 +0200 Subject: [PATCH 1/3] [ticket/12627] Add missing function definition for set_debug_sql_explain PHPBB3-12627 --- phpBB/phpbb/db/driver/driver.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index 581e78fe94..de51fbb5cc 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -108,7 +108,9 @@ abstract class driver implements driver_interface /** * {@inheritdoc} */ + public function set_debug_sql_explain($value) { + $this->debug_sql_explain = $value; } /** From d7fcf40b6b6c6d9f27d1ceb8e4dce00efedc526c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 9 Jul 2018 10:13:45 +0200 Subject: [PATCH 2/3] [ticket/12627] Add missing set_debug_load_time definition PHPBB3-12627 --- phpBB/phpbb/db/driver/driver.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index de51fbb5cc..93f0a749e5 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -105,6 +105,14 @@ abstract class driver implements driver_interface $this->one_char = chr(0) . '_'; } + /** + * {@inheritdoc} + */ + public function set_debug_load_time($value) + { + $this->debug_load_time = $value; + } + /** * {@inheritdoc} */ From 3bdc1d4e16f2ba6d056c4fc78b670ecf863d0974 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 9 Jul 2018 20:12:24 +0200 Subject: [PATCH 3/3] [ticket/12627] Fix stylelint issues in CSS files after merging 3.2.x PHPBB3-12627 --- phpBB/styles/prosilver/theme/common.css | 2 +- phpBB/styles/prosilver/theme/responsive.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 4a84c9e3e3..324d68f1bd 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1427,7 +1427,7 @@ ul.linklist:after, width: 50px; } -.dropdown .clone.hidden { +.dropdown .clone.hidden { display: none; } diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index e06882ebb5..deccb00503 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -498,8 +498,8 @@ .column2, .left-box.profile-details { float: none; - width: auto; clear: both; + width: auto; } /* Polls