SD-SimpleDesk

@@ -50,6 +50,7 @@

 		<hook hook="integrate_actions" function="shd_init_actions" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

 		<hook hook="integrate_buffer" function="shd_buffer_replace" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

 		<hook hook="integrate_menu_buttons" function="shd_main_menu" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

+		<hook hook="integrate_current_action" function="shd_init_current_action" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

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

 		<hook hook="integrate_error_types" function="shd_error_types" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

 		<hook hook="integrate_bbc_codes" function="shd_bbc_codes" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

@@ -113,6 +114,7 @@

 		<hook reverse="true" hook="integrate_actions" function="shd_init_actions" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

 		<hook reverse="true" hook="integrate_buffer" function="shd_buffer_replace" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

 		<hook reverse="true" hook="integrate_menu_buttons" function="shd_main_menu" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

+		<hook reverse="true" hook="integrate_current_action" function="shd_init_current_action" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

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

 		<hook reverse="true" hook="integrate_error_types" function="shd_error_types" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

 		<hook reverse="true" hook="integrate_bbc_codes" function="shd_bbc_codes" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />

@@ -1585,10 +1585,25 @@ function scheduled_simpledesk()

 	return true;

 }

+/**

+ *	Load the CSS file for the icons.

+ *

+ *	@param array &$current_action The current action.

+ *

+ *	@since 2.1

+*/

+function shd_init_current_action(&$current_action)

+{

+	global $context;

+

+	// Load some extra CSS

+	loadCSSFile('helpdesk_icons.css', array('minimize' => empty($context['shd_developer_mode']), 'seed' => $context['shd_css_version']), 'helpdesk_icons');

+}

+

 /**

  *	Adds the SimpleDesk action to the action list, and also handles most of the shutting down of forum items in helpdesk-only mode.

  *

- *	@param string &$actionArray The master list of actions from index.php

+ *	@param array &$actionArray The master list of actions from index.php

  *

  *	@since 2.0

 */

@@ -1599,9 +1614,6 @@ function shd_init_actions(&$actionArray)

 	if (empty($modSettings['helpdesk_active']))

 		return;

-	// Load some extra CSS

-	loadCSSFile('helpdesk_icons.css', array('minimize' => empty($context['shd_developer_mode']), 'seed' => $context['shd_css_version']), 'helpdesk_icons');

-

 	// Deal with SimpleDesk. If we're enabling HD only mode, rebuild everything, otherwise just add it to the array.

 	$actionArray['helpdesk'] = array('sd_source/SimpleDesk.php', 'shd_main');