[Customisation Database Commits] r553 - in /trunk/titania/includes: functions_display.php tools/sync.php

[Nathan Guse]

Author: exreaction
Date: Mon Feb  1 20:12:05 2010
New Revision: 553

Log:
SQL nub

Modified:
    trunk/titania/includes/functions_display.php
    trunk/titania/includes/tools/sync.php

Modified: trunk/titania/includes/functions_display.php
==============================================================================
*** trunk/titania/includes/functions_display.php (original)
--- trunk/titania/includes/functions_display.php Mon Feb  1 20:12:05 2010
***************
*** 162,168 ****
  			'FROM'	=> array(TITANIA_CONTRIB_COAUTHORS_TABLE => 'cc'),
  			'ON'	=> 'cc.contrib_id = c.contrib_id AND cc.user_id = ' . phpbb::$user->data['user_id'],
  		);
! 		$sql_ary['WHERE'] .= ' AND (c.contrib_status == ' . TITANIA_CONTRIB_APPROVED . '
  			OR c.contrib_user_id = ' . phpbb::$user->data['user_id'] . '
  			OR cc.active = 1)';
  	}
--- 162,168 ----
  			'FROM'	=> array(TITANIA_CONTRIB_COAUTHORS_TABLE => 'cc'),
  			'ON'	=> 'cc.contrib_id = c.contrib_id AND cc.user_id = ' . phpbb::$user->data['user_id'],
  		);
! 		$sql_ary['WHERE'] .= ' AND (c.contrib_status = ' . TITANIA_CONTRIB_APPROVED . '
  			OR c.contrib_user_id = ' . phpbb::$user->data['user_id'] . '
  			OR cc.active = 1)';
  	}

Modified: trunk/titania/includes/tools/sync.php
==============================================================================
*** trunk/titania/includes/tools/sync.php (original)
--- trunk/titania/includes/tools/sync.php Mon Feb  1 20:12:05 2010
***************
*** 186,192 ****
  			'WHERE'		=> 'cic.contrib_id = c.contrib_id
  				AND ' . phpbb::$db->sql_in_set('cic.category_id', array_map('intval', $child_list)) . '
  				AND c.contrib_visible = 1' .
! 				((titania::$config->require_validation) ? ' AND c.contrib_status == ' . TITANIA_CONTRIB_APPROVED : ''),
  		);
  		$sql = phpbb::$db->sql_build_query('SELECT', $sql_ary);
  		phpbb::$db->sql_query($sql);
--- 186,192 ----
  			'WHERE'		=> 'cic.contrib_id = c.contrib_id
  				AND ' . phpbb::$db->sql_in_set('cic.category_id', array_map('intval', $child_list)) . '
  				AND c.contrib_visible = 1' .
! 				((titania::$config->require_validation) ? ' AND c.contrib_status = ' . TITANIA_CONTRIB_APPROVED : ''),
  		);
  		$sql = phpbb::$db->sql_build_query('SELECT', $sql_ary);
  		phpbb::$db->sql_query($sql);