Use correct indexes on log read inserts (Fixes #98) Allow installing on 2.1 RC1 (Fxies #99) Updates Travis to build for PHP 7.3 as well
jdarwood007 commited on 2019-02-10 09:57:43
Showing 3 changed files, with 6 additions and 9 deletions.
- .travis.yml 15eb52e..48c3977
- package-info.xml 89eb2d8..e9ad464
- sd_source/SimpleDesk-Display.php bfa0f74..c0d9ce7
| ... | ... |
@@ -6,15 +6,11 @@ |
| 6 | 6 |
<version>2.1</version> |
| 7 | 7 |
<type>modification</type> |
| 8 | 8 |
|
| 9 |
- <install for="1.1.*, 2.0.*"> |
|
| 9 |
+ <install for="1.1.*, 2.0.*, 2.1 Beta 1, 2.1 Beta 2, 2.1 Beta 3"> |
|
| 10 | 10 |
<readme lang="english" parsebbc="true" type="inline">This mod is [b]not compatible[/b] with your version of SMF, it requires 2.1 or later.</readme> |
| 11 | 11 |
</install> |
| 12 | 12 |
|
| 13 |
- <install for="2.1 Beta 1, 2.1 Beta 2"> |
|
| 14 |
- <readme lang="english" parsebbc="true" type="inline">This package is for SMF 2.1, to install SimpleDesk on your version of SMF use the proper package.</readme> |
|
| 15 |
- </install> |
|
| 16 |
- |
|
| 17 |
- <install for="2.1 Beta 3, 2.1 Beta 4"> |
|
| 13 |
+ <install for="2.1 RC1, 2.1 RC2"> |
|
| 18 | 14 |
<!-- readme files --> |
| 19 | 15 |
<readme lang="english" parsebbc="true" type="file">language-readme/readme.english.txt</readme> |
| 20 | 16 |
|
| ... | ... |
@@ -102,7 +98,7 @@ |
| 102 | 98 |
<redirect url="?action=admin;area=helpdesk_info" /> |
| 103 | 99 |
</install> |
| 104 | 100 |
|
| 105 |
- <uninstall for="2.1 Beta 3, 2.1 Beta 4"> |
|
| 101 |
+ <uninstall for="2.1 RC1"> |
|
| 106 | 102 |
<!-- database changes, undone --> |
| 107 | 103 |
<database>uninstall-sd-optional.php</database> |
| 108 | 104 |
<code type="file">uninstall-sd-required.php</code> |
| ... | ... |
@@ -154,7 +150,7 @@ |
| 154 | 150 |
<hook hook="integrate_profile_trackip" function="shd_profile_trackip" reverse="true" /> |
| 155 | 151 |
|
| 156 | 152 |
<!-- Other --> |
| 157 |
- <hook hook='integrate_SSI' function='$sourcedir/SimpleDesk-SSI.php' reverse='true' /> |
|
| 153 |
+ <hook hook="integrate_SSI" function="$sourcedir/SimpleDesk-SSI.php" reverse="true" /> |
|
| 158 | 154 |
|
| 159 | 155 |
<!-- language files, removed --> |
| 160 | 156 |
<remove-dir name="$themes_dir/default/languages/sd_language" /> |
| ... | ... |
@@ -459,7 +459,7 @@ function shd_view_ticket() |
| 459 | 459 |
'{db_prefix}helpdesk_log_read',
|
| 460 | 460 |
array('id_ticket' => 'int', 'id_member' => 'int', 'id_msg' => 'int',),
|
| 461 | 461 |
array($context['ticket_id'], $user_info['id'], $ticketinfo['id_last_msg'],), |
| 462 |
- array('id_member', 'id_topic')
|
|
| 462 |
+ array('id_ticket', 'id_member')
|
|
| 463 | 463 |
); |
| 464 | 464 |
|
| 465 | 465 |
// Template stuff |
| 466 | 466 |