diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-06-18 18:12:28 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-06-18 18:12:28 +0000 |
| commit | eb5498dd55fa3d3c5005656b70c9f4cb0630f34c (patch) | |
| tree | fb9b132d93103230ecc35dba38322a332fda96dd /phpBB/faq.php | |
| parent | 7d3c89e25ab8aa87f09d3971a569d31f63dbef40 (diff) | |
| download | forums-eb5498dd55fa3d3c5005656b70c9f4cb0630f34c.tar forums-eb5498dd55fa3d3c5005656b70c9f4cb0630f34c.tar.gz forums-eb5498dd55fa3d3c5005656b70c9f4cb0630f34c.tar.bz2 forums-eb5498dd55fa3d3c5005656b70c9f4cb0630f34c.tar.xz forums-eb5498dd55fa3d3c5005656b70c9f4cb0630f34c.zip | |
Fix bug #31405 - Ability to define column split in FAQ/BBCode help (Bug #31405)
Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9623 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/faq.php')
| -rw-r--r-- | phpBB/faq.php | 25 |
1 files changed, 20 insertions, 5 deletions
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); |