[Customisation Database Commits] r1097 - in /branches/stable: ./ titania/includes/overlords/posts.php titania/styles/default/template/common/topic_list.html

[Nathan Guse]

Author: exreaction
Date: Tue Apr 20 03:06:03 2010
New Revision: 1097

Log:
Merge to stable

Modified:
    branches/stable/   (props changed)
    branches/stable/titania/includes/overlords/posts.php
    branches/stable/titania/styles/default/template/common/topic_list.html

Propchange: branches/stable/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Tue Apr 20 03:06:03 2010
***************
*** 1 ****
! /trunk:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090
--- 1 ----
! /trunk:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096

Modified: branches/stable/titania/includes/overlords/posts.php
==============================================================================
*** branches/stable/titania/includes/overlords/posts.php (original)
--- branches/stable/titania/includes/overlords/posts.php Tue Apr 20 03:06:03 2010
***************
*** 314,327 ****
--- 314,345 ----
  			$message = $post->generate_text_for_display();
  			$parsed_attachments = $attachments->parse_attachments($message);
  
+ 			// Build CP Fields
+ 			$cp_row = array();
+ 			if (isset(users_overlord::$cp_fields[$post->post_user_id]))
+ 			{
+ 				$cp_row = $cp->generate_profile_fields_template('show', false, users_overlord::$cp_fields[$post->post_user_id]);
+ 			}
+ 			$cp_row['row'] = (isset($cp_row['row']) && sizeof($cp_row['row'])) ? $cp_row['row'] : array();
+ 
  			phpbb::$template->assign_block_vars('posts', array_merge(
  				$post->assign_details(false),
  				users_overlord::assign_details($post->post_user_id),
+ 				$cp_row['row'],
  				array(
  					'POST_TEXT'				=> $message,
  					'S_FIRST_UNREAD'		=> ($post->post_time >= $last_mark_time && $prev_post_time <= $last_mark_time) ? true : false,
  				)
  			));
+ 
+ 			// Output CP Fields
+ 			if (!empty($cp_row['blockrow']))
+ 			{
+ 				foreach ($cp_row['blockrow'] as $field_data)
+ 				{
+ 					$template->assign_block_vars('posts.custom_fields', $field_data);
+ 				}
+ 			}
  	//S_IGNORE_POST
  	//POST_ICON_IMG
  	//MINI_POST_IMG

Modified: branches/stable/titania/styles/default/template/common/topic_list.html
==============================================================================
*** branches/stable/titania/styles/default/template/common/topic_list.html (original)
--- branches/stable/titania/styles/default/template/common/topic_list.html Tue Apr 20 03:06:03 2010
***************
*** 40,46 ****
  					<!-- ENDIF -->
  					<!-- IF topics.S_UNREAD_TOPIC --><a href="{topics.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topics.U_VIEW_TOPIC}" class="topictitle">{topics.TOPIC_SUBJECT}</a>
  					<!-- IF not topics.TOPIC_APPROVED or topics.S_POSTS_UNAPPROVED --><a href="{topics.U_MCP_QUEUE}">{topics.UNAPPROVED_IMG}</a> <!-- ENDIF -->
! 					<!-- IF topics.TOPIC_REPORTED --><a href="{topics.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
  					<!-- IF topics.PAGINATION --><strong class="pagination"><span>{topics.PAGINATION}</span></strong><!-- ENDIF -->
  					<!-- IF topics.ATTACH_ICON_IMG -->{topics.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topics.TOPIC_FIRST_POST_USER_FULL} &raquo; {topics.TOPIC_FIRST_POST_TIME}
  				</dt>
--- 40,46 ----
  					<!-- ENDIF -->
  					<!-- IF topics.S_UNREAD_TOPIC --><a href="{topics.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topics.U_VIEW_TOPIC}" class="topictitle">{topics.TOPIC_SUBJECT}</a>
  					<!-- IF not topics.TOPIC_APPROVED or topics.S_POSTS_UNAPPROVED --><a href="{topics.U_MCP_QUEUE}">{topics.UNAPPROVED_IMG}</a> <!-- ENDIF -->
! 					<!-- IF topics.TOPIC_REPORTED -->{REPORTED_IMG}<!-- ENDIF --><br />
  					<!-- IF topics.PAGINATION --><strong class="pagination"><span>{topics.PAGINATION}</span></strong><!-- ENDIF -->
  					<!-- IF topics.ATTACH_ICON_IMG -->{topics.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topics.TOPIC_FIRST_POST_USER_FULL} &raquo; {topics.TOPIC_FIRST_POST_TIME}
  				</dt>