screwed up a merge

This commit is contained in:
Graham Knop 2008-01-24 06:47:33 +00:00
parent 060a43261f
commit 89201092fb

View file

@ -257,7 +257,7 @@ sub getNextThread {
left join assetData on assetData.assetId=Thread.assetId and assetData.revisionDate=Thread.revisionDate
left join Post on Post.assetId=assetData.assetId and assetData.revisionDate=Post.revisionDate
where
asset.parentId=?,
asset.parentId=?
and asset.assetId <> ?
and asset.state='published'
and asset.className='WebGUI::Asset::Post::Thread'
@ -317,8 +317,8 @@ sub getPreviousThread {
left join assetData on assetData.assetId=Thread.assetId and assetData.revisionDate=Thread.revisionDate
left join Post on Post.assetId=assetData.assetId and assetData.revisionDate=Post.revisionDate
where
asset.parentId=?,
asset.assetId <> ?
asset.parentId=?
and asset.assetId <> ?
and asset.state='published'
and asset.className='WebGUI::Asset::Post::Thread'
and $sortBy $sortCompare ?