[Customisation Database Commits] r1120 - in /branches/stable: ./ titania/includes/objects/queue.php

[Nathan Guse]

Author: exreaction
Date: Mon Apr 26 04:48:23 2010
New Revision: 1120

Log:
Merge baby, merge!

Modified:
    branches/stable/   (props changed)
    branches/stable/titania/includes/objects/queue.php

Propchange: branches/stable/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Mon Apr 26 04:48:23 2010
***************
*** 1 ****
! /trunk:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117
--- 1 ----
! /trunk:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119

Modified: branches/stable/titania/includes/objects/queue.php
==============================================================================
*** branches/stable/titania/includes/objects/queue.php (original)
--- branches/stable/titania/includes/objects/queue.php Mon Apr 26 04:48:23 2010
***************
*** 206,212 ****
  			$queue_topic = new titania_topic;
  			$queue_topic->__set_array($queue_topic_row);
  
! 			$post->post_text .= '<a href="' . $queue_topic->get_url() . '">' . phpbb::$user->lang['QUEUE_DISCUSSION_TOPIC'] . "</a>\n\n";
  		}
  
  		// Add the queue notes
--- 206,212 ----
  			$queue_topic = new titania_topic;
  			$queue_topic->__set_array($queue_topic_row);
  
! 			$post->post_text .= '[url=' . $queue_topic->get_url() . ']' . phpbb::$user->lang['QUEUE_DISCUSSION_TOPIC'] . "[/url]\n\n";
  		}
  
  		// Add the queue notes
***************
*** 214,220 ****
  		decode_message($queue_notes, $this->queue_notes_uid);
  		if ($queue_notes)
  		{
! 			$post->post_text .= '[quote=&quot;' . phpbb::$user->lang['VALIDATION_NOTES'] . '&quot;]' . $queue_notes . "[/quote]\n\n";
  		}
  
  		// Add the MPV results
--- 214,220 ----
  		decode_message($queue_notes, $this->queue_notes_uid);
  		if ($queue_notes)
  		{
! 			$post->post_text .= '[quote=&quot;' . phpbb::$user->lang['VALIDATION_NOTES'] . '&quot;]' . $queue_notes . "[/quote]\n";
  		}
  
  		// Add the MPV results
***************
*** 222,234 ****
  		{
  			$mpv_results = $this->mpv_results;
  			decode_message($mpv_results, $this->mpv_results_uid);
! 			$post->post_text .= '[quote=&quot;' . phpbb::$user->lang['VALIDATION_MPV'] . '&quot;]' . $mpv_results . '[/quote]';
  		}
  
  		// @todo Add the Automod results
  		if ($this->automod_results)
  		{
! 			$post->post_text .= '[quote=&quot;' . phpbb::$user->lang['VALIDATION_AUTOMOD'] . '&quot;]' . $this->automod_results . '[/quote]';
  		}
  
  		// Prevent errors from different configurations
--- 222,234 ----
  		{
  			$mpv_results = $this->mpv_results;
  			decode_message($mpv_results, $this->mpv_results_uid);
! 			$post->post_text .= '[quote=&quot;' . phpbb::$user->lang['VALIDATION_MPV'] . '&quot;]' . $mpv_results . "[/quote]\n";
  		}
  
  		// @todo Add the Automod results
  		if ($this->automod_results)
  		{
! 			$post->post_text .= '[quote=&quot;' . phpbb::$user->lang['VALIDATION_AUTOMOD'] . '&quot;]' . $this->automod_results . "[/quote]\n";
  		}
  
  		// Prevent errors from different configurations