From e0b4f3ff37dfbea6ffb559f46575de7cc86d26be Mon Sep 17 00:00:00 2001 From: 3D-I Date: Tue, 23 Mar 2021 02:01:45 +0100 Subject: [PATCH 01/20] [ticket/16735] Fix access array offset on value of type bool on login PHPBB3-16735 --- phpBB/phpbb/auth/provider/db.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index a50e1343f6..adb6554e72 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -153,8 +153,10 @@ class db extends base } $login_error_attempts = 'LOGIN_ERROR_ATTEMPTS'; - $show_captcha = ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) || - ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']); + + $show_captcha = ($row) ? ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) || + ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']) : false; + if ($show_captcha) { $captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']); From 5b84c51d8165f3b93499504e0471ce9524a82d22 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Tue, 23 Mar 2021 02:41:04 +0100 Subject: [PATCH 02/20] [ticket/16735] Fix access array offset on value of type bool on login PHPBB3-16735 --- phpBB/phpbb/auth/provider/db.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index adb6554e72..2b8cc0d93b 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -154,8 +154,10 @@ class db extends base $login_error_attempts = 'LOGIN_ERROR_ATTEMPTS'; - $show_captcha = ($row) ? ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) || - ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']) : false; + $user_login_attempts = $row ? ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) : false; + $ip_login_attempts = (bool) ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']); + + $show_captcha = $user_login_attempts || $ip_login_attempts; if ($show_captcha) { From 736b619294e92ec79048a66334307c637ecb557a Mon Sep 17 00:00:00 2001 From: 3D-I Date: Tue, 23 Mar 2021 22:17:37 +0100 Subject: [PATCH 03/20] [ticket/16735] Fix access array offset on value of type bool on login Remove redundant type casting PHPBB3-16735 --- phpBB/phpbb/auth/provider/db.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 2b8cc0d93b..b20cdcf781 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -155,7 +155,7 @@ class db extends base $login_error_attempts = 'LOGIN_ERROR_ATTEMPTS'; $user_login_attempts = $row ? ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) : false; - $ip_login_attempts = (bool) ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']); + $ip_login_attempts = ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']); $show_captcha = $user_login_attempts || $ip_login_attempts; From c4efe5d0fa733afe6da127067e9a13ec041fc762 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Tue, 23 Mar 2021 23:57:43 +0100 Subject: [PATCH 04/20] [ticket/16735] Fix access array offset on value of type bool on login properly check if is an array first PHPBB3-16735 --- phpBB/phpbb/auth/provider/db.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index b20cdcf781..4810a9587e 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -154,7 +154,7 @@ class db extends base $login_error_attempts = 'LOGIN_ERROR_ATTEMPTS'; - $user_login_attempts = $row ? ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) : false; + $user_login_attempts = (is_array($row) && $this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']); $ip_login_attempts = ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']); $show_captcha = $user_login_attempts || $ip_login_attempts; From 92425fcb462fff661316117fb787213fe0c42472 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Fri, 26 Mar 2021 18:30:13 +0100 Subject: [PATCH 05/20] [ticket/16739] Replaces TOPIC_TITLE by SUBCJECT in short/report_pm.txt PHPBB3-16739 --- phpBB/language/en/email/short/report_pm.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/email/short/report_pm.txt b/phpBB/language/en/email/short/report_pm.txt index 7a5f17a7d9..771646046b 100644 --- a/phpBB/language/en/email/short/report_pm.txt +++ b/phpBB/language/en/email/short/report_pm.txt @@ -1,4 +1,4 @@ -Subject: Private Message report - "{TOPIC_TITLE}" +Subject: Private Message report - "{SUBJECT}" Hello {USERNAME}, From 718d2dc77e972ce1f1b3b4bda5c7889e58aa9d0c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 26 Mar 2021 21:08:31 +0100 Subject: [PATCH 06/20] [ticket/16675] Use github base branch head rev for commit message check PHPBB3-16675 --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c72abf2f36..d9018e5261 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -83,7 +83,8 @@ jobs: - name: Check commit message if: github.event_name == 'pull_request' run: | - git-tools/commit-msg-hook-range.sh $(git rev-list --merges -n 1 HEAD^1)..$GITHUB_SHA + git fetch origin $GITHUB_BASE_REF &> /dev/null + git-tools/commit-msg-hook-range.sh $(git rev-parse origin/$GITHUB_BASE_REF)..$GITHUB_SHA # Tests for MySQL and MariaDB mysql-tests: From 645e662b110b0d5c246d32ac5368c3bf6eabf86b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 26 Mar 2021 22:54:19 +0100 Subject: [PATCH 07/20] [ticket/16740] Add method for ensuring resource is not passed to cache PHPBB3-16740 --- phpBB/phpbb/db/driver/postgres.php | 63 ++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php index 52a5b6b546..b004ecee30 100644 --- a/phpBB/phpbb/db/driver/postgres.php +++ b/phpBB/phpbb/db/driver/postgres.php @@ -277,9 +277,10 @@ class postgres extends \phpbb\db\driver\driver $query_id = $this->query_result; } - if ($cache && $cache->sql_exists($query_id)) + $safe_query_id = $this->clean_query_id($query_id); + if ($cache && $cache->sql_exists($safe_query_id)) { - return $cache->sql_fetchrow($query_id); + return $cache->sql_fetchrow($safe_query_id); } return ($query_id) ? pg_fetch_assoc($query_id, null) : false; @@ -297,14 +298,47 @@ class postgres extends \phpbb\db\driver\driver $query_id = $this->query_result; } - if ($cache && $cache->sql_exists($query_id)) + $safe_query_id = $this->clean_query_id($query_id); + if ($cache && $cache->sql_exists($safe_query_id)) { - return $cache->sql_rowseek($rownum, $query_id); + return $cache->sql_rowseek($rownum, $safe_query_id); } return ($query_id) ? @pg_result_seek($query_id, $rownum) : false; } + /** + * {@inheritDoc} + */ + function sql_fetchfield($field, $rownum = false, $query_id = false) + { + global $cache; + + if ($query_id === false) + { + $query_id = $this->query_result; + } + + if ($query_id) + { + if ($rownum !== false) + { + $this->sql_rowseek($rownum, $query_id); + } + + $safe_query_id = $this->clean_query_id($query_id); + if ($cache && !is_object($query_id) && $cache->sql_exists($safe_query_id)) + { + return $cache->sql_fetchfield($safe_query_id, $field); + } + + $row = $this->sql_fetchrow($query_id); + return (isset($row[$field])) ? $row[$field] : false; + } + + return false; + } + /** * {@inheritDoc} */ @@ -346,14 +380,15 @@ class postgres extends \phpbb\db\driver\driver $query_id = $this->query_result; } - if ($cache && !is_object($query_id) && $cache->sql_exists($query_id)) + $safe_query_id = $this->clean_query_id($query_id); + if ($cache && !is_object($query_id) && $cache->sql_exists($safe_query_id)) { - return $cache->sql_freeresult($query_id); + return $cache->sql_freeresult($safe_query_id); } - if (isset($this->open_queries[(int) $query_id])) + if (isset($this->open_queries[(int) $safe_query_id])) { - unset($this->open_queries[(int) $query_id]); + unset($this->open_queries[(int) $safe_query_id]); return pg_free_result($query_id); } @@ -505,4 +540,16 @@ class postgres extends \phpbb\db\driver\driver { return '"' . $msg . '"'; } + + /** + * Ensure query ID can be used by cache + * + * @param resource|int|string $query_id Mixed type query id + * + * @return int|string Query id in string or integer format + */ + private function clean_query_id($query_id) + { + return is_resource($query_id) ? (int) $query_id : $query_id; + } } From 03824189e4c32c85ddbcdf98016f2ce25a26ac74 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 26 Mar 2021 22:56:57 +0100 Subject: [PATCH 08/20] [ticket/16740] Add more postgres tests to github actions PHPBB3-16740 --- .github/workflows/tests.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c72abf2f36..e14579d620 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -242,6 +242,16 @@ jobs: db: "postgres:12" - php: '7.1' db: "postgres:13" + - php: '7.2' + db: "postgres:13" + - php: '7.3' + db: "postgres:13" + - php: '7.4' + db: "postgres:13" + - php: '8.0' + db: "postgres:12" + - php: '8.0' + db: "postgres:13" name: PHP ${{ matrix.php }} - ${{ matrix.db }} From c99bfe116fef648b17796367abcbf4e2bc4b53b5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Mar 2021 09:52:55 +0200 Subject: [PATCH 09/20] [ticket/16740] Improve open queries handling & do not close freed connection PHPBB3-16740 --- phpBB/phpbb/db/driver/postgres.php | 9 +++++++-- tests/test_framework/phpbb_database_test_case.php | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php index b004ecee30..cd17f3294d 100644 --- a/phpBB/phpbb/db/driver/postgres.php +++ b/phpBB/phpbb/db/driver/postgres.php @@ -386,9 +386,9 @@ class postgres extends \phpbb\db\driver\driver return $cache->sql_freeresult($safe_query_id); } - if (isset($this->open_queries[(int) $safe_query_id])) + if (isset($this->open_queries[$safe_query_id])) { - unset($this->open_queries[(int) $safe_query_id]); + unset($this->open_queries[$safe_query_id]); return pg_free_result($query_id); } @@ -466,6 +466,11 @@ class postgres extends \phpbb\db\driver\driver */ function _sql_close() { + // Released resources are already closed, return true in this case + if (get_resource_type($this->db_connect_id) === 'Unknown') + { + return true; + } return @pg_close($this->db_connect_id); } diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index ebaf573753..c46bbe11c3 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -29,7 +29,7 @@ abstract class phpbb_database_test_case extends TestCase static protected $install_schema_file; - static protected $phpunit_version; + static protected $phpunit_version; public function __construct($name = NULL, array $data = [], $dataName = '') { From 1e6ed3f0f5b109fe75dfd16242946c4d59397ed4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Mar 2021 09:59:36 +0200 Subject: [PATCH 10/20] [ticket/16740] Disable PHP 8.1 tests PHPBB3-16740 --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e14579d620..e99074c3c5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -123,8 +123,8 @@ jobs: db: "mysql:8.0" - php: '8.0' db: "mysql:5.7" - - php: '8.1' - db: "mysql:5.7" + #- php: '8.1' + # db: "mysql:5.7" name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} From e8afa2901340ac8be496bbc3b0013432f92b541c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Mar 2021 11:16:11 +0200 Subject: [PATCH 11/20] [ticket/16740] Implement sql_table_exists for psql w/out debug spam Failed pg_query() results in PHP notices now ... PHPBB3-16740 --- phpBB/phpbb/db/tools/postgres.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/phpBB/phpbb/db/tools/postgres.php b/phpBB/phpbb/db/tools/postgres.php index 7cb024d4f6..573b40fe5d 100644 --- a/phpBB/phpbb/db/tools/postgres.php +++ b/phpBB/phpbb/db/tools/postgres.php @@ -96,6 +96,24 @@ class postgres extends tools return $tables; } + /** + * {@inheritDoc} + */ + function sql_table_exists($table_name) + { + $sql = "SELECT CAST(EXISTS( + SELECT FROM information_schema.tables + WHERE table_schema = 'public' + AND table_name = '" . $this->db->sql_escape($table_name) . "' + ) AS INTEGER)"; + $result = $this->db->sql_query_limit($sql, 1); + $row = $this->db->sql_fetchrow($result); + $table_exists = (booL) $row['exists']; + $this->db->sql_freeresult($result); + + return $table_exists; + } + /** * {@inheritDoc} */ From e49a6e06a8cf6043f0eb25cd3276a59eed50a7c8 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Sun, 28 Mar 2021 21:34:13 +0200 Subject: [PATCH 12/20] [ticket/16743] Properly check if TMP file exists - PHP 8 PHPBB3-16743 --- phpBB/phpbb/files/filespec.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/files/filespec.php b/phpBB/phpbb/files/filespec.php index d6d753024b..59c7948d1f 100644 --- a/phpBB/phpbb/files/filespec.php +++ b/phpBB/phpbb/files/filespec.php @@ -476,7 +476,10 @@ class filespec } // Remove temporary filename - @unlink($this->filename); + if (file_exists($this->filename)) + { + @unlink($this->filename); + } if (count($this->error)) { From 4ce8224c2cbe7d8ddd01fa0b0f25bdb858d3ac1f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 31 Mar 2021 21:22:14 +0200 Subject: [PATCH 13/20] [ticket/16740] Use is_resource() to check whether connect id is still valid PHPBB3-16740 --- phpBB/phpbb/db/driver/postgres.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php index cd17f3294d..7541d1e6b6 100644 --- a/phpBB/phpbb/db/driver/postgres.php +++ b/phpBB/phpbb/db/driver/postgres.php @@ -467,7 +467,7 @@ class postgres extends \phpbb\db\driver\driver function _sql_close() { // Released resources are already closed, return true in this case - if (get_resource_type($this->db_connect_id) === 'Unknown') + if (!is_resource($this->db_connect_id)) { return true; } From 222c7cd74be24dfb88eafcf48484080fa1f85f81 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Fri, 19 Mar 2021 10:38:08 +0100 Subject: [PATCH 14/20] [ticket/16719] Fix PHP notice/warning on update PHPBB3-16719 --- phpBB/install/app.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/phpBB/install/app.php b/phpBB/install/app.php index 36d16e914b..25386b5038 100644 --- a/phpBB/install/app.php +++ b/phpBB/install/app.php @@ -17,9 +17,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); if (!defined('PHPBB_ENVIRONMENT')) -{ - define('PHPBB_ENVIRONMENT', 'production'); -} + $phpbb_root_path = '../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); From b6f4f3001582fad1f57a028040f137e4083698da Mon Sep 17 00:00:00 2001 From: 3D-I Date: Fri, 19 Mar 2021 10:42:34 +0100 Subject: [PATCH 15/20] [ticket/16719] Fix PHP notice/warning on update PHPBB3-16719 --- phpBB/install/app.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/install/app.php b/phpBB/install/app.php index 25386b5038..bf2c81bfcc 100644 --- a/phpBB/install/app.php +++ b/phpBB/install/app.php @@ -16,7 +16,6 @@ */ define('IN_PHPBB', true); define('IN_INSTALL', true); -if (!defined('PHPBB_ENVIRONMENT')) $phpbb_root_path = '../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); From 8e5be03fe94d2de53697a140dc73b7257c825169 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Sat, 20 Mar 2021 19:33:38 +0100 Subject: [PATCH 16/20] [ticket/16719] Fix PHP notice/warning on update PHPBB3-16719 --- phpBB/includes/constants.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 65f1b07fd8..3d35280671 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -247,7 +247,10 @@ define('BANLIST_TABLE', $table_prefix . 'banlist'); define('BBCODES_TABLE', $table_prefix . 'bbcodes'); define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks'); define('BOTS_TABLE', $table_prefix . 'bots'); -@define('CONFIG_TABLE', $table_prefix . 'config'); +if (!defined('CONFIG_TABLE')) +{ + define('CONFIG_TABLE', $table_prefix . 'config'); +} define('CONFIG_TEXT_TABLE', $table_prefix . 'config_text'); define('CONFIRM_TABLE', $table_prefix . 'confirm'); define('DISALLOW_TABLE', $table_prefix . 'disallow'); From e79afc6293836f3e33cf1df24d791af1dabc407f Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Sat, 3 Apr 2021 13:02:14 +0200 Subject: [PATCH 17/20] [ticket/16747] post_in_queue.txt change aprroval to approval PHPBB3-16747 --- phpBB/language/en/email/post_in_queue.txt | 2 +- phpBB/language/en/email/short/post_in_queue.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/language/en/email/post_in_queue.txt b/phpBB/language/en/email/post_in_queue.txt index d3a8259a9a..8ccbc8e9bb 100644 --- a/phpBB/language/en/email/post_in_queue.txt +++ b/phpBB/language/en/email/post_in_queue.txt @@ -1,4 +1,4 @@ -Subject: Post needs aprroval - "{TOPIC_TITLE}" +Subject: Post needs approval - "{TOPIC_TITLE}" Hello {USERNAME}, diff --git a/phpBB/language/en/email/short/post_in_queue.txt b/phpBB/language/en/email/short/post_in_queue.txt index d3a8259a9a..8ccbc8e9bb 100644 --- a/phpBB/language/en/email/short/post_in_queue.txt +++ b/phpBB/language/en/email/short/post_in_queue.txt @@ -1,4 +1,4 @@ -Subject: Post needs aprroval - "{TOPIC_TITLE}" +Subject: Post needs approval - "{TOPIC_TITLE}" Hello {USERNAME}, From f861f1fb9adcc8459fb1f94618e607912ecae7ed Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 27 Apr 2021 21:19:36 +0200 Subject: [PATCH 18/20] [prep-release-3.3.4] Update version numbers to 3.3.4 --- build/build.xml | 4 ++-- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index 2b71c363fc..50dac3a126 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 3d35280671..e460ad2756 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -@define('PHPBB_VERSION', '3.3.4-RC1'); +@define('PHPBB_VERSION', '3.3.4'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index c9aef2b7b6..9a96dc45bf 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.4-RC1'); +define('PHPBB_VERSION', '3.3.4'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 57cada98db..101dedce6f 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.4-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.4'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 21c5c5a33655543dddc8fcbcc9f284fb3e907da8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 27 Apr 2021 21:19:40 +0200 Subject: [PATCH 19/20] [prep-release-3.3.4] Add migration for 3.3.4 --- phpBB/phpbb/db/migration/data/v33x/v334.php | 36 +++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v334.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v334.php b/phpBB/phpbb/db/migration/data/v33x/v334.php new file mode 100644 index 0000000000..05a47b09a7 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v334.php @@ -0,0 +1,36 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +class v334 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.4', '>='); + } + + static public function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v334rc1', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.4']], + ]; + } +} From 782b0758efb00f6bf0698c3a71489355e5893d94 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 27 Apr 2021 21:20:02 +0200 Subject: [PATCH 20/20] [prep-release-3.3.4] Update changelog for 3.3.4 --- phpBB/docs/CHANGELOG.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 11091ca5c5..af9e47d5e7 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog