diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:40 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:40 +0100 |
| commit | 021c186be91095397d4e76801738373989360a52 (patch) | |
| tree | 4a5b42c0ebcaeb0be77edacb839bf164fe2dadc0 /phpBB/faq.php | |
| parent | 4f9c3b8f5c0181c2ebf367436f3c0336d8f2251d (diff) | |
| parent | 3ddedd5ff228cdcc3c0b05000affe3944afc7854 (diff) | |
| download | forums-021c186be91095397d4e76801738373989360a52.tar forums-021c186be91095397d4e76801738373989360a52.tar.gz forums-021c186be91095397d4e76801738373989360a52.tar.bz2 forums-021c186be91095397d4e76801738373989360a52.tar.xz forums-021c186be91095397d4e76801738373989360a52.zip | |
Merge commit 'release-3.0.6-RC1'
Diffstat (limited to 'phpBB/faq.php')
| -rw-r--r-- | phpBB/faq.php | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/phpBB/faq.php b/phpBB/faq.php index da064e4452..0a04bad8eb 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,11 +71,13 @@ 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); +page_header($l_title, false); $template->set_filenames(array( 'body' => 'faq_body.html') |