5 files changed, 32 insertions, 6 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 0ff9d63ec9..7ea4eb26c2 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -127,6 +127,7 @@
 		<li>[Change] Quote BBCode no longer requires the f_reply permission. (Bug #16079)</li>
 		<li>[Change] Banning/unbanning users now generates an entry in their user notes (Bug #21825 - Patch by nickvergessen)</li>
 		<li>[Change] Smilies no longer require the f_bbcode permission. (Bug #26545)</li>
+		<li>[Change] Ability to define column split in FAQ/BBCode help (Bug #31405)</li>
 		<li>[Feature] Backported 3.2 captcha plugins.</li>
 		<li>[Feature] Introduced new ACM plugins:
 			<ul>
diff --git a/phpBB/faq.php b/phpBB/faq.php
index da064e4452..04353de50f 100644
--- a/phpBB/faq.php
+++ b/phpBB/faq.php
@@ -38,15 +38,28 @@ switch ($mode)
 }
 
 // Pull the array data from the lang pack
+$switch_column = $found_switch = false;
 $help_blocks = array();
 foreach ($user->help as $help_ary)
 {
 	if ($help_ary[0] == '--')
 	{
+		if ($help_ary[1] == '--')
+		{
+			$switch_column = true;
+			$found_switch = true;
+			continue;
+		}
+
 		$template->assign_block_vars('faq_block', array(
-			'BLOCK_TITLE'		=> $help_ary[1])
-		);
+			'BLOCK_TITLE'		=> $help_ary[1],
+			'SWITCH_COLUMN'		=> $switch_column,
+		));
 
+		if ($switch_column)
+		{
+			$switch_column = false;
+		}
 		continue;
 	}
 
@@ -58,9 +71,11 @@ foreach ($user->help as $help_ary)
 
 // Lets build a page ...
 $template->assign_vars(array(
-	'L_FAQ_TITLE'	=> $l_title,
-	'L_BACK_TO_TOP'	=> $user->lang['BACK_TO_TOP'])
-);
+	'L_FAQ_TITLE'				=> $l_title,
+	'L_BACK_TO_TOP'				=> $user->lang['BACK_TO_TOP'],
+
+	'SWITCH_COLUMN_MANUALLY'	=> (!$found_switch) ? true : false,
+));
 
 page_header($l_title);
 
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index ed6fea96d3..df5f950e3e 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -78,6 +78,11 @@ $help = array(
 		0 => 'Creating an Ordered list',
 		1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
 	),
+	// This block will switch the FAQ-Questions to the second template column
+	array(
+		0 => '--',
+		1 => '--'
+	),
 	array(
 		0 => '--',
 		1 => 'Creating Links'
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 89ac845021..88b2cc273d 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -202,6 +202,11 @@ $help = array(
 		0 => 'What are topic icons?',
 		1 => 'Topic icons are author chosen images associated with posts to indicate their content. The ability to use topic icons depends on the permissions set by the board administrator.'
 	),
+	// This block will switch the FAQ-Questions to the second template column
+	array(
+		0 => '--',
+		1 => '--'
+	),
 	array(
 		0 => '--',
 		1 => 'User Levels and Groups'
diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html
index 78c2fc11b7..36d677a505 100644
--- a/phpBB/styles/prosilver/template/faq_body.html
+++ b/phpBB/styles/prosilver/template/faq_body.html
@@ -7,7 +7,7 @@
 	<div class="inner"><span class="corners-top"><span></span></span>
 		<div class="column1">
 		<!-- BEGIN faq_block -->
-			<!-- IF faq_block.S_ROW_COUNT == 4 -->
+			<!-- IF faq_block.SWITCH_COLUMN or (SWITCH_COLUMN_MANUALLY and faq_block.S_ROW_COUNT == 4) -->
 				</div>
 
 				<div class="column2">