From 462dc69b8e8568f4656675b31b99a31ad98e1331 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 6 Jul 2006 16:46:53 +0000
Subject: some bugfixes

git-svn-id: file:///svn/phpbb/trunk@6149 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_display.php | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/functions_display.php')

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index c408f39d50..eec11408dd 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -652,7 +652,7 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold
 			break;
 
 			default:
-				if ($replies >= $config['hot_threshold'])
+				if ($config['hot_threshold'] && $replies >= $config['hot_threshold'])
 				{
 					$folder = 'folder_hot';
 					$folder_new = 'folder_hot_new';
@@ -897,6 +897,39 @@ function display_attachments($forum_id, $blockname, &$attachment_data, &$update_
 	return $return_tpl;
 }
 
+/**
+* Assign/Build custom bbcodes for display in screens supporting using of bbcodes
+* The custom bbcodes buttons will be placed within the template block 'custom_codes'
+*/
+function display_custom_bbcodes()
+{
+	global $db, $template;
+
+	// Start counting from 22 for the bbcode ids (every bbcode takes two ids - opening/closing)
+	$num_predefined_bbcodes = 22;
+
+	/*
+	* @todo while adjusting custom bbcodes, think about caching this query as well as correct ordering
+	*/
+	$sql = 'SELECT bbcode_id, bbcode_tag 
+		FROM ' . BBCODES_TABLE . '
+		WHERE display_on_posting = 1';
+	$result = $db->sql_query($sql);
+
+	$i = 0;
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$template->assign_block_vars('custom_tags', array(
+			'BBCODE_NAME'	=> "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'",
+			'BBCODE_ID'		=> $num_predefined_bbcodes + ($i * 2),
+			'BBCODE_TAG'	=> $row['bbcode_tag'])
+		);
+
+		$i++;
+	}
+	$db->sql_freeresult($result);
+}
+
 /**
 * Display reasons
 */
-- 
cgit v1.2.1