Skip to content

Commit b8ea36a

Browse files
marc1706marc1706
committed
Merge branch 'prep-release-3.3.15' into 3.3.x
2 parents 64dd8b6 + b92ca5d commit b8ea36a

File tree

7 files changed

+84
-22
lines changed

7 files changed

+84
-22
lines changed

‎build/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
44
<!-- a few settings for the build -->
55
<property name="newversion" value="3.3.16-dev" />
6-
<property name="prevversion" value="3.3.14" />
7-
<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10, 3.3.11, 3.3.12, 3.3.13" />
6+
<property name="prevversion" value="3.3.15" />
7+
<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10, 3.3.11, 3.3.12, 3.3.13, 3.3.14" />
88
<!-- no configuration should be needed beyond this point -->
99

1010
<property name="oldversions" value="${olderversions}, ${prevversion}" />

‎phpBB/adm/style/admin.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* Parse document block
77
*/
8-
function parse_document(container)
8+
function parse_document(container)
99
{
1010
var test = document.createElement('div'),
1111
oldBrowser = (typeof test.style.borderRadius == 'undefined');
@@ -90,7 +90,7 @@ function parse_document(container)
9090
}
9191
});
9292
}
93-
93+
9494
headersLength = headers.length;
9595

9696
// Add header text to each cell as <dfn>
@@ -121,8 +121,8 @@ function parse_document(container)
121121
}
122122

123123
if ((text.length && text !== '-') || cell.children().length) {
124-
if (headers[column] != '') {
125-
cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
124+
if (headers[column].length) {
125+
cell.prepend($("<dfn>").css('display', 'none').text(headers[column]));
126126
}
127127
}
128128
else {
@@ -143,7 +143,7 @@ function parse_document(container)
143143
*/
144144
container.find('table.responsive > tbody').each(function() {
145145
var items = $(this).children('tr');
146-
if (items.length == 0)
146+
if (!items.length)
147147
{
148148
$(this).parent('table:first').addClass('responsive-hide');
149149
}
@@ -157,7 +157,7 @@ function parse_document(container)
157157
if ($this.html() == '&nbsp;') {
158158
$this.addClass('responsive-hide');
159159
}
160-
160+
161161
});
162162

163163
/**
@@ -184,7 +184,7 @@ function parse_document(container)
184184
var width = $body.width(),
185185
height = $this.height();
186186

187-
if (arguments.length == 0 && (!responsive || width <= lastWidth) && height <= maxHeight) {
187+
if (!arguments.length && (!responsive || width <= lastWidth) && height <= maxHeight) {
188188
return;
189189
}
190190

‎phpBB/adm/style/ajax.js‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,20 @@ function submitPermissions() {
235235
if ($alertBoxLink) {
236236
// Remove forum_id[] from URL
237237
$alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/g, ''));
238-
var previousPageForm = '<form action="' + $alertBoxLink.attr('href') + '" method="post">';
238+
const $previousPageForm = $('<form>').attr({
239+
action: $alertBoxLink.attr('href'),
240+
method: 'post'
241+
});
242+
239243
$.each(forumIds, function (key, value) {
240-
previousPageForm += '<input type="text" name="forum_id[]" value="' + value + '" />';
244+
$previousPageForm.append($('<input>').attr({
245+
type: 'text',
246+
name: 'forum_id[]',
247+
value: value
248+
}));
241249
});
242-
previousPageForm += '</form>';
243250

244251
$alertBoxLink.on('click', function (e) {
245-
var $previousPageForm = $(previousPageForm);
246252
$('body').append($previousPageForm);
247253
e.preventDefault();
248254
$previousPageForm.submit();
@@ -257,12 +263,19 @@ function submitPermissions() {
257263
setTimeout(function () {
258264
// Create forum to submit using POST. This will prevent
259265
// exceeding the maximum length of URLs
260-
var form = '<form action="' + res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/g, '') + '" method="post">';
266+
const $form = $('<form>').attr({
267+
action: res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/g, ''),
268+
method: 'post'
269+
});
270+
261271
$.each(forumIds, function (key, value) {
262-
form += '<input type="text" name="forum_id[]" value="' + value + '" />';
272+
$form.append($('<input>').attr({
273+
type: 'text',
274+
name: 'forum_id[]',
275+
value: value
276+
}));
263277
});
264-
form += '</form>';
265-
$form = $(form);
278+
266279
$('body').append($form);
267280

268281
// Hide the alert even if we refresh the page, in case the user

‎phpBB/docs/CHANGELOG.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ <h1>Changelog</h1>
5050
<ol>
5151
<li><a href="#changelog">Changelog</a>
5252
<ul>
53+
<li><a href="#v3315rc1">Changes since 3.3.15-RC1</a></li>
5354
<li><a href="#v3314">Changes since 3.3.14</a></li>
5455
<li><a href="#v3314rc1">Changes since 3.3.14-RC1</a></li>
5556
<li><a href="#v3313">Changes since 3.3.13</a></li>
@@ -174,6 +175,16 @@ <h1>Changelog</h1>
174175
<div class="inner">
175176

176177
<div class="content">
178+
<a name="v3315rc1"></a><h3>Changes since 3.3.15-RC1</h3>
179+
<h4>Bug</h4>
180+
<ul>
181+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17480">PHPBB-17480</a>] - PHP fatal error in version check failure</li>
182+
</ul>
183+
<h4>Security Issue</h4>
184+
<ul>
185+
<li>[<a href="https://tracker.phpbb.com/browse/SECURITY-283">SECURITY-283</a>] - Use jQuery to generate HTML from page data</li>
186+
</ul>
187+
177188
<a name="v3314"></a><h3>Changes since 3.3.14</h3>
178189
<h4>Bug</h4>
179190
<ul>

‎phpBB/install/phpbbcli.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
define('IN_PHPBB', true);
2424
define('IN_INSTALL', true);
2525
define('PHPBB_ENVIRONMENT', 'production');
26-
define('PHPBB_VERSION', '3.3.15-RC1');
26+
define('PHPBB_VERSION', '3.3.15');
2727
$phpbb_root_path = __DIR__ . '/../';
2828
$phpEx = substr(strrchr(__FILE__, '.'), 1);
2929

‎phpBB/phpbb/db/migration/data/v33x/v3315.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
*
4+
* This file is part of the phpBB Forum Software package.
5+
*
6+
* @copyright (c) phpBB Limited <https://www.phpbb.com>
7+
* @license GNU General Public License, version 2 (GPL-2.0)
8+
*
9+
* For full copyright and license information, please see
10+
* the docs/CREDITS.txt file.
11+
*
12+
*/
13+
14+
namespace phpbb\db\migration\data\v33x;
15+
16+
class v3315 extends \phpbb\db\migration\migration
17+
{
18+
public function effectively_installed()
19+
{
20+
return version_compare($this->config['version'], '3.3.15', '>=');
21+
}
22+
23+
public static function depends_on()
24+
{
25+
return [
26+
'\phpbb\db\migration\data\v33x\v3315rc1',
27+
];
28+
}
29+
30+
public function update_data()
31+
{
32+
return [
33+
['config.update', ['version', '3.3.15']],
34+
];
35+
}
36+
}

‎phpBB/styles/prosilver/template/forum_fn.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ function parseDocument($container) {
650650
html = $children.html();
651651
}
652652

653-
$block.append((first ? '' : '<br />') + html);
653+
$block.append((first ? '' : '<br>') + html);
654654

655655
first = false;
656656
});
@@ -670,7 +670,7 @@ function parseDocument($container) {
670670

671671
// Find all headers, get contents
672672
$list.prev('.topiclist').find('li.header dd').not('.mark').each(function() {
673-
headers.push($(this).text());
673+
headers.push($("<div>").text($(this).text()).html());
674674
headersLength++;
675675
});
676676

@@ -707,7 +707,7 @@ function parseDocument($container) {
707707
html = headers[i] + ': <strong>' + html + '</strong>';
708708
}
709709

710-
$block.append((first ? '' : '<br />') + html);
710+
$block.append((first ? '' : '<br>') + html);
711711

712712
first = false;
713713
});
@@ -773,7 +773,9 @@ function parseDocument($container) {
773773
}
774774

775775
if ((text.length && text !== '-') || cell.children().length) {
776-
cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
776+
if (headers[column].length) {
777+
cell.prepend($("<dfn>").css('display', 'none').text(headers[column]));
778+
}
777779
} else {
778780
cell.addClass('empty');
779781
}

0 commit comments

Comments
 (0)