From 5170cd67fbbb7c120a1321b24c9fa3dc1f0a6a5c Mon Sep 17 00:00:00 2001 From: cyberalien Date: Fri, 12 Jun 2015 21:26:12 +0300 Subject: [PATCH 1/8] [ticket/13939] Check if loadingIndicator exists before accessing it PHPBB3-13939 --- phpBB/assets/javascript/core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index cc016e52ee..84e27c3a49 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -106,7 +106,7 @@ phpbb.alert.open = function($alert) { $dark.fadeIn(phpbb.alertTime); } - if ($loadingIndicator.is(':visible')) { + if ($loadingIndicator && $loadingIndicator.is(':visible')) { $loadingIndicator.fadeOut(phpbb.alertTime, function() { $dark.append($alert); $alert.fadeIn(phpbb.alertTime); From 714533d12e4950a07891524d81662bf91af14752 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 13 Jun 2015 16:59:13 +0200 Subject: [PATCH 2/8] [ticket/13942] Check if path to language file contains language path PHPBB3-13942 --- phpBB/phpbb/user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 882e9cef26..3bc1af2899 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -637,7 +637,7 @@ class user extends \phpbb\session $lang_path = $this->lang_path; } - if (strpos($phpbb_root_path . $filename, $lang_path . $this->lang_name . '/') === 0) + if (strpos($phpbb_root_path . $filename, $lang_path) === 0) { $language_filename = $phpbb_root_path . $filename; } From f9c50a8db397e254cc0604ab7173707f600448ac Mon Sep 17 00:00:00 2001 From: cyberalien Date: Fri, 12 Jun 2015 15:13:51 +0300 Subject: [PATCH 3/8] [ticket/13938] Remove link to print.css in simple_header.html Remaining fixes for ticket 13873: remove link to print.css and remove type and media from other links. PHPBB3-13938 --- phpBB/styles/prosilver/template/simple_header.html | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index ab4f855a97..de79ef2028 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -6,18 +6,17 @@ {META} {SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE} - - - - - + + + + - + From 338abf77e3b8e48a5d74ba399348c7e0f78fc6b7 Mon Sep 17 00:00:00 2001 From: cyberalien Date: Fri, 12 Jun 2015 15:15:52 +0300 Subject: [PATCH 4/8] [ticket/13938] Change web font code in simple_header Apply ticket 13876 to simple_header.html PHPBB3-13938 --- .../prosilver/template/simple_header.html | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index de79ef2028..637ac59465 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -6,7 +6,22 @@ {META} {SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE} - + + + From 8eb4ec29eeea02460c98e07f120e216d3154fe8a Mon Sep 17 00:00:00 2001 From: cyberalien Date: Fri, 12 Jun 2015 15:20:18 +0300 Subject: [PATCH 5/8] [ticket/13938] Remove type and / from elements PHPBB3-13938 --- phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html | 2 +- phpBB/styles/prosilver/template/viewtopic_print.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html index 7fe0d67077..55d81b4e69 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html @@ -6,7 +6,7 @@ {META} {SITENAME} • {PAGE_TITLE} - + diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index 66199295bb..f65f1ab542 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -6,7 +6,7 @@ {META} {SITENAME} • {PAGE_TITLE} - + From e6407907e289f4f0a6e141eeebfe02c60110904c Mon Sep 17 00:00:00 2001 From: cyberalien Date: Fri, 12 Jun 2015 15:18:15 +0300 Subject: [PATCH 6/8] [ticket/13938] Fix inconsistencies between tags PHPBB3-13938 --- .../prosilver/template/overall_header.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 4e2013e276..2b2036883b 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -7,17 +7,17 @@ <!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --> - - - - - - - + + + + + + + - + - + From 38a1442d400d183549ee6febe11de956e96bc6db Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sun, 14 Jun 2015 16:11:22 +0200 Subject: [PATCH 7/8] [prep-release-3.1.5] Update version for final 3.1.5 release --- build/build.xml | 4 ++-- phpBB/docs/CHANGELOG.html | 2 ++ phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/build.xml b/build/build.xml index c3f23b4386..17daf9b19b 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e5aeb34144..c9b292ab6d 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -146,6 +146,8 @@
  • [PHPBB3-13913] - Post subject of password protected and list-only forums shown on board index
  • [PHPBB3-13922] - Whitespace found at end of line phpBB/includes/functions_admin.php
  • [PHPBB3-13928] - Fix build_cfg_template_test after ticket/sec-184
    • +
  • [PHPBB3-13939] - phpBB no longer shows error messages when uploading files with drag/drop
    • +
  • [PHPBB3-13942] - phpbb\user::set_lang() adds extra path and PHP extension to ext lang files

    • Improvement

      diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 3e44125204..d686588802 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.1.5-RC1'); +define('PHPBB_VERSION', '3.1.5'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 972ee579db..d49a6418fe 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 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.1.5-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.5'); 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 8f5d76111243fae8d2926037e8fef0cbc97802c7 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sun, 14 Jun 2015 16:14:07 +0200 Subject: [PATCH 8/8] [prep-release-3.1.5] Add migration for 3.1.5 --- phpBB/phpbb/db/migration/data/v31x/v315.php | 31 +++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v31x/v315.php diff --git a/phpBB/phpbb/db/migration/data/v31x/v315.php b/phpBB/phpbb/db/migration/data/v31x/v315.php new file mode 100644 index 0000000000..778cdf717e --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v315.php @@ -0,0 +1,31 @@ + +* @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\v31x; + +class v315 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v315rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.5')), + ); + } +}