From c62c7deae0587f7a8341ffc7bde8358dfc564092 Mon Sep 17 00:00:00 2001
From: sicommnend <russell@Inspiron-531>
Date: Wed, 14 Sep 2016 15:35:38 -0600
Subject: [PATCH] Check pre-query

Check pre query to prevent duplicate listings.

Signed-off-by: sicommnend <>
---
 install.xml      | 10 +++++-----
 package-info.xml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/install.xml b/install.xml
index 943d47a..a6e3f01 100644
--- a/install.xml
+++ b/install.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE modification SYSTEM "http://www.simplemachines.org/xml/modification">
 <modification xmlns="http://www.simplemachines.org/xml/modification" xmlns:smf="http://www.simplemachines.org/">
 	<id>NEND:clonetopic</id>
-	<version>0.4.3</version>
+	<version>0.4.5</version>
 	<file name="$boarddir/index.php">
 		<operation>
 			<search position="after"><![CDATA[		'credits' => array('Who.php', 'Credits'),
@@ -123,8 +123,8 @@ $txt['permissionname_simple_clone_any'] = 'Clone anyone\'s topic';
 			WHERE t.id_board = {int:current_board}' . (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
 				AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . ']]></search>
 			<add><![CDATA[
-				'.($clone_topics ? 'OR t.id_topic IN ({array_int:clone_topics})' : '' ).(!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
-				AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') .']]></add>
+				'.($clone_topics ? 'OR t.id_topic IN ({array_int:clone_topics})'.(!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
+				AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') : '' ) .']]></add>
 		</operation>
 		<operation>
 			<search position="before"><![CDATA[			ORDER BY ' . (!empty($modSettings['enableStickyTopics']) ? 'is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' : '') . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') . '
@@ -161,8 +161,8 @@ $txt['permissionname_simple_clone_any'] = 'Clone anyone\'s topic';
 			WHERE ' . ($pre_query ? 't.id_topic IN ({array_int:topic_list})' : 't.id_board = {int:current_board}') . (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
 				AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . ']]></search>
 			<add><![CDATA[
-				'.($clone_topics ? 'OR t.id_topic IN ({array_int:clone_topics})' : '' ).(!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
-				AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') .']]></add>
+				'.($clone_topics && !$pre_query ? 'OR t.id_topic IN ({array_int:clone_topics})'.(!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
+				AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') : '' ) .']]></add>
 		</operation>
 		<operation>
 			<search position="before"><![CDATA[			ORDER BY ' . ($pre_query ? 'FIND_IN_SET(t.id_topic, {string:find_set_topics})' : (!empty($modSettings['enableStickyTopics']) ? 'is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' : '') . $_REQUEST['sort'] . ($ascending ? '' : ' DESC')) . '
diff --git a/package-info.xml b/package-info.xml
index 64db3ce..1fef43c 100644
--- a/package-info.xml
+++ b/package-info.xml
@@ -3,7 +3,7 @@
 <package-info xmlns="http://www.simplemachines.org/xml/package-info" xmlns:smf="http://www.simplemachines.org/">
 	<id>NEND:clonetopic</id>
 	<name>Clone Topic</name>
-	<version>0.4.3</version>
+	<version>0.4.5</version>
 	<type>modification</type>
 <install>
 	<database>db.php</database>