More CI Cleanup
jdarwood007 commited on 2019-03-09 11:51:20
Showing 4 changed files, with 7 additions and 8 deletions.
- sd_source/SimpleDesk-Post.php 3ba02e8..53fa707
- sd_source/Subs-SimpleDeskDisplay.php 66f96cc..faba1c3
- sd_template/SimpleDesk-BoardIndex.template.php 75a8379..d47a410
- sd_template/SimpleDesk.template.php 27acce9..62e96a8
| ... | ... |
@@ -517,10 +517,10 @@ function shd_save_ticket() |
| 517 | 517 |
), |
| 518 | 518 |
); |
| 519 | 519 |
|
| 520 |
- if (!empty($context['ticket_id']) && !empty($ticketinfo)) |
|
| 520 |
+ if (!empty($context['ticket_id']) && !empty($ticketinfo) && !empty($ticketinfo['starter_id'])) |
|
| 521 | 521 |
{
|
| 522 | 522 |
loadMemberData($ticketinfo['starter_id']); |
| 523 |
- if (loadMemberContext($ticketinfo['starter_id'])) |
|
| 523 |
+ if (isset($memberContext[$ticketinfo['starter_id']]) && loadMemberContext($ticketinfo['starter_id'])) |
|
| 524 | 524 |
$context['ticket_form']['member'] = array( |
| 525 | 525 |
'name' => $ticketinfo['starter_name'], |
| 526 | 526 |
'id' => $ticketinfo['starter_id'], |
| ... | ... |
@@ -2066,7 +2066,7 @@ function shd_handle_attachments() |
| 2066 | 2066 |
if (in_array('bad_extension', $attachmentOptions['errors']))
|
| 2067 | 2067 |
{
|
| 2068 | 2068 |
checkSubmitOnce('free');
|
| 2069 |
- return fatal_error($attachmentOptions['name'] . '.<br>' . $txt['cant_upload_type'] . ' ' . strtr($modSettings['attachmentExtensions'], array(',' => ', ')) . '.', false);
|
|
| 2069 |
+ shd_fatal_lang_error($attachmentOptions['name'] . '.<br>' . $txt['cant_upload_type'] . ' ' . strtr($modSettings['attachmentExtensions'], array(',' => ', ')) . '.', false);
|
|
| 2070 | 2070 |
} |
| 2071 | 2071 |
if (in_array('directory_full', $attachmentOptions['errors']))
|
| 2072 | 2072 |
{
|
| ... | ... |
@@ -2076,7 +2076,7 @@ function shd_handle_attachments() |
| 2076 | 2076 |
if (in_array('bad_filename', $attachmentOptions['errors']))
|
| 2077 | 2077 |
{
|
| 2078 | 2078 |
checkSubmitOnce('free');
|
| 2079 |
- return fatal_error(basename($attachmentOptions['name']) . '.<br>' . $txt['restricted_filename'] . '.', 'critical'); |
|
| 2079 |
+ shd_fatal_lang_error(basename($attachmentOptions['name']) . '.<br>' . $txt['restricted_filename'] . '.', 'critical'); |
|
| 2080 | 2080 |
} |
| 2081 | 2081 |
if (in_array('taken_filename', $attachmentOptions['errors']))
|
| 2082 | 2082 |
{
|
| ... | ... |
@@ -38,7 +38,7 @@ function shd_download_request(&$attachRequest) |
| 38 | 38 |
global $smcFunc; |
| 39 | 39 |
|
| 40 | 40 |
// Is this already a resource? Then another hook has claimed the attachment as theirs. |
| 41 |
- if (is_resource($attachRequest) && empty($_REQUEST['ticket'])) |
|
| 41 |
+ if (!empty($attachRequest) && is_resource($attachRequest) && empty($_REQUEST['ticket'])) |
|
| 42 | 42 |
return; |
| 43 | 43 |
// If we don't have a ticket present, it is not our attachment. |
| 44 | 44 |
elseif (empty($_REQUEST['ticket'])) |
| ... | ... |
@@ -26,9 +26,8 @@ function template_bi_shd_icon($board) |
| 26 | 26 |
/** |
| 27 | 27 |
* Board Index Integration for SimpleDesk Stats. |
| 28 | 28 |
* |
| 29 |
- * @param array $board Current board information. |
|
| 30 | 29 |
* @since 2.1 |
| 31 | 30 |
*/ |
| 32 |
-function template_bi_shd_stats($board) |
|
| 31 |
+function template_bi_shd_stats() |
|
| 33 | 32 |
{
|
| 34 | 33 |
} |
| 35 | 34 |
\ No newline at end of file |
| ... | ... |
@@ -581,7 +581,7 @@ function template_shd_maintenance_below() |
| 581 | 581 |
// Provide a placeholder in the event template_button_strip isn't defined (like in the mobile templates) |
| 582 | 582 |
if (!function_exists('template_button_strip'))
|
| 583 | 583 |
{
|
| 584 |
- function template_button_strip($navigation, $direction = '', $strip_options = array()) |
|
| 584 |
+ function template_button_strip() |
|
| 585 | 585 |
{
|
| 586 | 586 |
} |
| 587 | 587 |
} |
| 588 | 588 |
\ No newline at end of file |
| 589 | 589 |