SD-SimpleDesk

@@ -112,7 +112,7 @@ h3.ticketheader img {

 /* Ticket details (Left-floated box) */

 .shd_ticket_side_column {

-	width: 23%;

+	min-width: 23%;

 	padding: 0;

 }

 .shd_ticketdetails {

@@ -3,10 +3,17 @@

 <package-info xmlns="http://www.simplemachines.org/xml/package-info" xmlns:smf="http://www.simplemachines.org/">

 	<id>SimpleDeskTeam:SimpleDesk</id>

 	<name>SimpleDesk - Integrated Helpdesk for Simple Machines Forum</name>

-	<version>2.1.1</version>

+	<version>2.1.2</version>

 	<type>modification</type>

-	<upgrade from="2.1.0" for="2.1.3-2.1.99">

+	<!-- (Minor Upgrade) This should just be the files we need to get to the current. -->

+	<upgrade from="2.1.1" for="2.1.4-2.1.99">

+		<require-file name="sd_template/SimpleDesk.template.php" destination="$themedir/sd_template" />

+		<hook hook="integrate_repair_attachments_nomsg" function="shd_repair_attachments_nomsg" file="$sourcedir/sd_source/Subs-SimpleDeskManageAttachments.php" />

+	</upgrade>

+

+	<!-- (Large upgrade) This should always indicate the lowest package we can upgrade from and all changes to the current -->

+	<upgrade from="2.1.0" for="2.1.4-2.1.99">

 		<!-- language files -->

 		<require-dir name="sd_language" destination="$themes_dir/default/languages" />

@@ -38,7 +45,7 @@

 		<require-dir name="sd_plugins_lang" destination="$languagedir" />

 	</upgrade>

-	<install for="2.1.3-2.1.99">

+	<install for="2.1.4-2.1.99">

 		<!-- readme files -->

 		<readme lang="english" parsebbc="true" type="file">language-readme/readme.english.txt</readme>

@@ -95,6 +102,7 @@

 		<hook hook="integrate_remove_attachments" function="shd_remove_attachments" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" />

 		<hook hook="integrate_attachments_browse" function="shd_attachments_browse" file="$sourcedir/sd_source/Subs-SimpleDeskManageAttachments.php" />

 		<hook hook="integrate_attachment_remove" function="shd_attachment_remove" file="$sourcedir/sd_source/Subs-SimpleDeskManageAttachments.php" />

+		<hook hook="integrate_repair_attachments_nomsg" function="shd_repair_attachments_nomsg" file="$sourcedir/sd_source/Subs-SimpleDeskManageAttachments.php" />

 			<!-- Admin Section: Packages -->

 		<hook hook="integrate_packages_sort_id" function="shd_packages_sort_id" file="$sourcedir/sd_source/Subs-SimpleDeskPackages.php" />

@@ -132,7 +140,7 @@

 		<credits url="https://www.simpledesk.net" license="BSD 3-Clause" licenseurl="https://github.com/SimpleMachines/SimpleDesk/blob/master/license.txt" copyright="2010-2021">Simple Desk</credits>

 	</install>

-	<uninstall for="2.1.3-2.1.99">

+	<uninstall for="2.1.4-2.1.99">

 		<!-- database changes, undone -->

 		<database>uninstall-sd-optional.php</database>

 		<code type="file">uninstall-sd-required.php</code>

@@ -160,6 +168,7 @@

 		<hook reverse="true" hook="integrate_remove_attachments" function="shd_remove_attachments" file="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" />

 		<hook reverse="true" hook="integrate_attachments_browse" function="shd_attachments_browse" file="$sourcedir/sd_source/Subs-SimpleDeskManageAttachments.php" />

 		<hook reverse="true" hook="integrate_attachment_remove" function="shd_attachment_remove" file="$sourcedir/sd_source/Subs-SimpleDeskManageAttachments.php" />

+		<hook reverse="true" hook="integrate_repair_attachments_nomsg" function="shd_repair_attachments_nomsg" file="$sourcedir/sd_source/Subs-SimpleDeskManageAttachments.php" />

 			<!-- Admin Section: Packages -->

 		<hook reverse="true" hook="integrate_packages_sort_id" function="shd_packages_sort_id" file="$sourcedir/sd_source/Subs-SimpleDeskPackages.php" />

@@ -46,15 +46,15 @@ function shd_repair_attachments_nomsg(&$ignore_ids, $min_substep, $max_substep)

 		FROM {db_prefix}attachments AS a

 			LEFT JOIN {db_prefix}helpdesk_attachments AS hda ON (hda.id_attach = a.id_attach)

 			LEFT JOIN {db_prefix}helpdesk_ticket_replies AS hdtr ON (hdtr.id_msg = hda.id_msg)

-		WHERE a.id_attach BETWEEN {int:substep} AND {int:max_substep} + 499

+		WHERE a.id_attach BETWEEN {int:substep} AND {int:max_substep}

 			AND a.id_member = {int:no_member}

-			AND a.id_msg != {int:no_msg}

+			AND a.id_msg = {int:no_msg}

 			AND hdtr.id_msg IS NOT NULL',

 		array(

 			'no_member' => 0,

 			'no_msg' => 0,

 			'substep' => $min_substep,

-			'max_substep' => $min_substep >= $max_substep ? $min_substep + 499 : $max_substep,

+			'max_substep' => $min_substep >= $max_substep ? $min_substep + 500 : $max_substep,

 			'ignore_ids' => $ignore_ids,

 		)

 	);

@@ -981,7 +981,7 @@ function shd_get_postable_depts()

 /**

  *	Set a ticket to on hold or restore to the proper status.

  *

- *	@param bool $on_hold (default true) Whether this ticket should be on hold or not.

+ *	@param bool $on_hold (default false) Whether this ticket should be on hold or not.

  *	@param array &$ticketOptions - a hash array by reference, stating one or more details necessary to change on a ticket:

  *	<ul>

  *	<li>id: Required in all cases, numeric ticket id that the edit relates to</li>

@@ -995,10 +995,12 @@ function shd_get_postable_depts()

  *	@return bool True on success, false on failure.

  *	@since 2.1

 */

-function shd_ticket_on_hold($on_hold = false, &$ticketOptions)

+function shd_ticket_on_hold($on_hold, &$ticketOptions)

 {

 	global $context, $smcFunc;

+	$on_hold = !is_bool($on_hold) ? false : $on_hold;

+

 	$current_status = !isset($context['ticket_form']['status']) ? 0 : $context['ticket_form']['status'];

 	$new_status = $current_status;

@@ -562,7 +562,7 @@ function template_ticket_footer()

 	if (!empty($modSettings['show_modify']) && !empty($context['ticket_form']['modified']))

 		echo '

 						<div class="smalltext shd_modified">

-							&#171; <em>', sprintf($txt['last_edit_by'], $context['ticket']['modified']['time'], $context['ticket']['modified']['link']), '</em> &#187;

+							&#171; <em>', sprintf($txt['last_edit_by'], $context['ticket_form']['modified']['time'], $context['ticket_form']['modified']['link']), '</em> &#187;

 						</div>';

 	echo '

@@ -87,9 +87,6 @@ function template_main()

 			template_ticket_block();

 	}

-	echo '

-		</div>';

-

 	//echo 'I\'m alive!!!!!!!!!!1111oneone'; 	- I had to save this :P

 }