[Customisation Database Commits] r1118 - in /branches/stable: ./ titania/manage/queue_discussion.php

[Nathan Guse]

Author: exreaction
Date: Mon Apr 26 04:35:27 2010
New Revision: 1118

Log:
Merge!

Modified:
    branches/stable/   (props changed)
    branches/stable/titania/manage/queue_discussion.php

Propchange: branches/stable/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Mon Apr 26 04:35:27 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
--- 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

Modified: branches/stable/titania/manage/queue_discussion.php
==============================================================================
*** branches/stable/titania/manage/queue_discussion.php (original)
--- branches/stable/titania/manage/queue_discussion.php Mon Apr 26 04:35:27 2010
***************
*** 47,55 ****
  	{
  		foreach ($authed as $type_id)
  		{
! 			$sql = 'SELECT COUNT(queue_id) AS cnt FROM ' . TITANIA_QUEUE_TABLE . '
! 				WHERE queue_type = ' . (int) $type_id . '
! 					AND queue_status = 1';
  			phpbb::$db->sql_query($sql);
  			$cnt = phpbb::$db->sql_fetchfield('cnt');
  			phpbb::$db->sql_freeresult();
--- 47,55 ----
  	{
  		foreach ($authed as $type_id)
  		{
! 			$sql = 'SELECT COUNT(topic_id) AS cnt FROM ' . TITANIA_TOPICS_TABLE . '
! 				WHERE topic_type = ' . TITANIA_QUEUE_DISCUSSION . '
! 					AND topic_category = ' . (int) $type_id;
  			phpbb::$db->sql_query($sql);
  			$cnt = phpbb::$db->sql_fetchfield('cnt');
  			phpbb::$db->sql_freeresult();