From a752a424de3d250c2bc79f7b680c936fc9ea987f Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 30 Nov 2008 14:36:59 +0000
Subject: =?UTF-8?q?[Change]=20Performance=20increase=20for=20format=5Fdate?=
 =?UTF-8?q?()=20(Bug=20#37575=20-=20Patch=20by=20BartVB)=20[Change]=20Chan?=
 =?UTF-8?q?ged=20prosilver=20date=20separator=20from=20'on'=20to=20'=C2=BB?=
 =?UTF-8?q?'=20[Feature]=20Added=20'AGO'=20setting=20to=20relative=20date?=
 =?UTF-8?q?=20strings.=20For=20example:=20posted=2014=20minutes=20ago.=20(?=
 =?UTF-8?q?Patch=20by=20BartVB)=20[Fix]=20Extend=20vertical=20line=20for?=
 =?UTF-8?q?=20last=20post=20column=20if=20no=20posts=20in=20forum=20(Bug?=
 =?UTF-8?q?=20#37125)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9136 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/ucp/ucp_main.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/ucp')

diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 73e4af8b04..6f4e525b2f 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -25,7 +25,7 @@ class ucp_main
 {
 	var $p_master;
 	var $u_action;
-	
+
 	function ucp_main(&$p_master)
 	{
 		$this->p_master = &$p_master;
@@ -70,7 +70,7 @@ class ucp_main
 				$sql = 'SELECT forum_id
 					FROM ' . FORUMS_TABLE . '
 					WHERE forum_type = ' . FORUM_POST;
-	
+
 				if (sizeof($forum_ary))
 				{
 					$sql .= ' AND ' . $db->sql_in_set('forum_id', $forum_ary, true);
@@ -258,7 +258,7 @@ class ucp_main
 				{
 					$forbidden_forums = $auth->acl_getf('!f_read', true);
 					$forbidden_forums = array_unique(array_keys($forbidden_forums));
-					
+
 					$sql_array = array(
 						'SELECT'	=> 'f.*',
 
@@ -339,6 +339,7 @@ class ucp_main
 							'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '" />' : '',
 							'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
 							'FORUM_NAME'			=> $row['forum_name'],
+							'FORUM_DESC'			=> generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
 							'LAST_POST_SUBJECT'		=> $row['forum_last_post_subject'],
 							'LAST_POST_TIME'		=> $last_post_time,
 
@@ -420,7 +421,7 @@ class ucp_main
 				}
 				$forbidden_forums = $auth->acl_getf('!f_read', true);
 				$forbidden_forums = array_unique(array_keys($forbidden_forums));
-				
+
 				$this->assign_topiclist('bookmarks', $forbidden_forums);
 
 			break;
@@ -676,7 +677,7 @@ class ucp_main
 				'WHERE'		=> 'tw.user_id = ' . $user->data['user_id'] . '
 					AND t.topic_id = tw.topic_id
 					AND ' . $db->sql_in_set('t.forum_id', $forbidden_forum_ary, true, true),
-					
+
 
 				'ORDER_BY'	=> 't.topic_last_post_time DESC'
 			);
-- 
cgit v1.2.1