- if ($wsid == 0) {
- $queryParts = array(
- 'SELECT' => t3lib_BEfunc::getCommonSelectFields($foreign_table,$foreign_table.'.'),
- 'FROM' => $foreign_table.',pages',
- 'WHERE' => 'pages.uid='.$foreign_table.'.pid' .
- t3lib_BEfunc::deleteClause('pages').
- t3lib_BEfunc::deleteClause($foreign_table).
- ($pageClause != ' 1=1' ? ' AND ' . $pageClause : '') .
- ' ' . $wgolParts['WHERE'],
- 'GROUPBY' => $wgolParts['GROUPBY'],
- 'ORDERBY' => $wgolParts['ORDERBY'],
- 'LIMIT' => $wgolParts['LIMIT']
- );
- }
- else {
- $queryParts = array(
- 'SELECT' => t3lib_BEfunc::getCommonSelectFields($foreign_table,$foreign_table.'.'),
- 'FROM' => $foreign_table,
- 'WHERE' => $foreign_table . '.pid=-1 AND ' .
- $foreign_table . '.t3ver_wsid=' . $wsid .
- t3lib_BEfunc::deleteClause($foreign_table).
- $wgolParts['WHERE'],
- 'GROUPBY' => $wgolParts['GROUPBY'],
- 'ORDERBY' => $wgolParts['ORDERBY'],
- 'LIMIT' => $wgolParts['LIMIT']
- );
- }
+ $queryParts = array(
+ 'SELECT' => t3lib_BEfunc::getCommonSelectFields($foreign_table,$foreign_table.'.'),
+ 'FROM' => $foreign_table.',pages',
+ 'WHERE' => 'pages.uid='.$foreign_table.'.pid
+ AND pages.deleted=0 '.
+ t3lib_BEfunc::deleteClause($foreign_table).
+ ' AND '.$pageClause.' '.
+ $wgolParts['WHERE'],
+ 'GROUPBY' => $wgolParts['GROUPBY'],
+ 'ORDERBY' => $wgolParts['ORDERBY'],
+ 'LIMIT' => $wgolParts['LIMIT']
+ );