Merge branch '3.2.x'

phpBB/includes/acp/acp_styles.php

@@ -1355,18 +1355,18 @@ class acp_styles
 		}
 
 		// Hardcoded template bitfield to add for new templates
+		$default_bitfield = '1111111111111';
+
 		$bitfield = new bitfield();
-		$bitfield->set(0);
+		for ($i = 0; $i < strlen($default_bitfield); $i++)
-		$bitfield->set(1);
+		{
-		$bitfield->set(2);
+			if ($default_bitfield[$i] == '1')
-		$bitfield->set(3);
+			{
-		$bitfield->set(4);
+				$bitfield->set($i);
-		$bitfield->set(8);
+			}
-		$bitfield->set(9);
+		}
-		$bitfield->set(11);
+
-		$bitfield->set(12);
+		return $bitfield->get_base64();
-		$value = $bitfield->get_base64();
-		return $value;
 	}
 
 }

phpBB/install/schemas/schema_data.sql

@@ -486,7 +486,7 @@ INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order)
 INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', 10);
 
 # -- phpbb_styles
-INSERT INTO phpbb_styles (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '© phpBB Limited', 1, 'prosilver', 'kNg=', 0, '');
+INSERT INTO phpbb_styles (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '© phpBB Limited', 1, 'prosilver', '//g=', 0, '');
 
 # -- Forums
 INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts_approved, forum_posts_unapproved, forum_posts_softdeleted, forum_topics_approved, forum_topics_unapproved, forum_topics_softdeleted, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed, forum_parents) VALUES ('{L_FORUMS_FIRST_CATEGORY}', '', 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 'Admin', 'AA0000', 972086460, '', '', '', '', '', '', '', 0, 0, '');

phpBB/phpbb/db/migration/data/v32x/update_prosilver_bitfield.php

@@ -0,0 +1,39 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @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\v32x;
+
+class update_prosilver_bitfield extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v32x\v321',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_bbcode_bitfield'))),
+		);
+	}
+
+	public function update_bbcode_bitfield()
+	{
+		$sql = 'UPDATE ' . STYLES_TABLE . "
+			SET bbcode_bitfield = '//g='
+			WHERE style_path = 'prosilver'";
+		$this->sql_query($sql);
+	}
+}

phpBB/phpbb/textformatter/s9e/factory.php

@@ -78,7 +78,7 @@ class factory implements \phpbb\textformatter\cache_interface
 		'b'     => '[B]{TEXT}[/B]',
 		'code'  => '[CODE lang={IDENTIFIER;optional}]{TEXT}[/CODE]',
 		'color' => '[COLOR={COLOR}]{TEXT}[/COLOR]',
-		'email' => '[EMAIL={EMAIL;useContent} subject={TEXT;optional;postFilter=rawurlencode} body={TEXT;optional;postFilter=rawurlencode}]{TEXT}[/EMAIL]',
+		'email' => '[EMAIL={EMAIL;useContent} subject={TEXT1;optional;postFilter=rawurlencode} body={TEXT2;optional;postFilter=rawurlencode}]{TEXT}[/EMAIL]',
 		'flash' => '[FLASH={NUMBER1},{NUMBER2} width={NUMBER1;postFilter=#flashwidth} height={NUMBER2;postFilter=#flashheight} url={URL;useContent} /]',
 		'i'     => '[I]{TEXT}[/I]',
 		'img'   => '[IMG src={IMAGEURL;useContent}]',

phpBB/styles/prosilver/style.cfg

@@ -25,7 +25,7 @@ style_version = 3.3.0-a1-dev
 phpbb_version = 3.3.0-a1-dev
 
 # Defining a different template bitfield
-# template_bitfield = lNg=
+# template_bitfield = //g=
 
 # Parent style
 # Set value to empty or to this style's name if this style does not have a parent style

tests/functional/posting_test.php

@@ -235,7 +235,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 		));
 		$crawler = self::submit($form);
 		$this->assertContains(
-			'<span style="font-weight: bold">My signature</span>',
+			'<strong class="text-strong">My signature</strong>',
 			$crawler->filter('#preview .signature')->html()
 		);
 	}