pre-freeze on main templates, various bug fixes (highlighting search results, various search related issues, blah blah). These updates need _thorough_ checking, quickly

git-svn-id: file:///svn/phpbb/trunk@2448 89ea8834-ac86-4346-8a33-228a782c2dd0

1 files changed, 25 insertions, 37 deletions

diff --git a/phpBB/faq.php b/phpBB/faq.php
index ea741799e9..7c406eb79f 100644
--- a/phpBB/faq.php
+++ b/phpBB/faq.php
@@ -21,7 +21,7 @@
  ***************************************************************************/
 
 define('IN_PHPBB', true);
-$phpbb_root_path = "./";
+$phpbb_root_path = './';
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
 
@@ -37,24 +37,23 @@ init_userprefs($userdata);
 //
 // Load the appropriate faq file
 //
-
 if( isset($HTTP_GET_VARS['mode']) )
 {
 	switch( $HTTP_GET_VARS['mode'] )
 	{
 		case 'bbcode':
-			$lang_file = "lang_bbcode";
+			$lang_file = 'lang_bbcode';
 			$l_title = $lang['BBCode_guide'];
 			break;
 		default:
-			$lang_file = "lang_faq";
+			$lang_file = 'lang_faq';
 			$l_title = $lang['FAQ'];
 			break;
 	}
 }
 else
 {
-	$lang_file = "lang_faq";
+	$lang_file = 'lang_faq';
 	$l_title = $lang['FAQ'];
 }
 include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/' . $lang_file . '.' . $phpEx);
@@ -70,7 +69,7 @@ $faq_block_titles = array();
 
 for($i = 0; $i < count($faq); $i++)
 {
-	if( $faq[$i][0] != "--" )
+	if( $faq[$i][0] != '--' )
 	{
 		$faq_block[$j][$counter]['id'] = $counter_2;
 		$faq_block[$j][$counter]['question'] = $faq[$i][0];
@@ -96,35 +95,24 @@ $page_title = $l_title;
 include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
 $template->set_filenames(array(
-	"body" => "faq_body.tpl",
-	"jumpbox" => "jumpbox.tpl")
-);
-
-$jumpbox = make_jumpbox($forum_id);
-$template->assign_vars(array(
-	"L_GO" => $lang['Go'],
-	"L_JUMP_TO" => $lang['Jump_to'],
-	"L_SELECT_FORUM" => $lang['Select_forum'],
-
-	"S_JUMPBOX_LIST" => $jumpbox,
-	"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
+	'body' => 'faq_body.tpl')
 );
-$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+make_jumpbox('viewforum.'.$phpEx, $forum_id);
 
 $template->assign_vars(array(
-	"L_FAQ_TITLE" => $l_title, 
-	"L_BACK_TO_TOP" => $lang['Back_to_top'])
+	'L_FAQ_TITLE' => $l_title, 
+	'L_BACK_TO_TOP' => $lang['Back_to_top'])
 );
 
 for($i = 0; $i < count($faq_block); $i++)
 {
 	if( count($faq_block[$i]) )
 	{
-		$template->assign_block_vars("faq_block", array(
-			"BLOCK_TITLE" => $faq_block_titles[$i])
+		$template->assign_block_vars('faq_block', array(
+			'BLOCK_TITLE' => $faq_block_titles[$i])
 		);
-		$template->assign_block_vars("faq_block_link", array( 
-			"BLOCK_TITLE" => $faq_block_titles[$i])
+		$template->assign_block_vars('faq_block_link', array( 
+			'BLOCK_TITLE' => $faq_block_titles[$i])
 		);
 
 		for($j = 0; $j < count($faq_block[$i]); $j++)
@@ -132,27 +120,27 @@ for($i = 0; $i < count($faq_block); $i++)
 			$row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
 			$row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
 
-			$template->assign_block_vars("faq_block.faq_row", array(
-				"ROW_COLOR" => "#" . $row_color,
-				"ROW_CLASS" => $row_class,
-				"FAQ_QUESTION" => $faq_block[$i][$j]['question'], 
-				"FAQ_ANSWER" => $faq_block[$i][$j]['answer'], 
+			$template->assign_block_vars('faq_block.faq_row', array(
+				'ROW_COLOR' => '#' . $row_color,
+				'ROW_CLASS' => $row_class,
+				'FAQ_QUESTION' => $faq_block[$i][$j]['question'], 
+				'FAQ_ANSWER' => $faq_block[$i][$j]['answer'], 
 
-				"U_FAQ_ID" => $faq_block[$i][$j]['id'])
+				'U_FAQ_ID' => $faq_block[$i][$j]['id'])
 			);
 
-			$template->assign_block_vars("faq_block_link.faq_row_link", array(
-				"ROW_COLOR" => "#" . $row_color,
-				"ROW_CLASS" => $row_class,
-				"FAQ_LINK" => $faq_block[$i][$j]['question'], 
+			$template->assign_block_vars('faq_block_link.faq_row_link', array(
+				'ROW_COLOR' => '#' . $row_color,
+				'ROW_CLASS' => $row_class,
+				'FAQ_LINK' => $faq_block[$i][$j]['question'], 
 
-				"U_FAQ_LINK" => "#" . $faq_block[$i][$j]['id'])
+				'U_FAQ_LINK' => '#' . $faq_block[$i][$j]['id'])
 			);
 		}
 	}
 }
 
-$template->pparse("body");
+$template->pparse('body');
 
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);