friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Merge remote-tracking branch 'upstream/2023.09-rc' into warnings

Browse source
This commit is contained in:
Michael 2023-10-29 11:42:21 +00:00
parent d317eb71d1 9c53c0c8d1
commit b1ab551f75
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.woodpecker/.phpunit.yml
View file

@ -5,11 +5,11 @@ matrix:
- PHP_MAJOR_VERSION: 7.4 - PHP_MAJOR_VERSION: 7.4
PHP_VERSION: 7.4.33 PHP_VERSION: 7.4.33
- PHP_MAJOR_VERSION: 8.0 - PHP_MAJOR_VERSION: 8.0
PHP_VERSION: 8.0.29 PHP_VERSION: 8.0.30
- PHP_MAJOR_VERSION: 8.1 - PHP_MAJOR_VERSION: 8.1
PHP_VERSION: 8.1.21 PHP_VERSION: 8.1.23
- PHP_MAJOR_VERSION: 8.2 - PHP_MAJOR_VERSION: 8.2
PHP_VERSION: 8.2.8 PHP_VERSION: 8.2.11
# This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...) # This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
labels: labels:

2
smileybutton/smileybutton.php
View file

@ -90,7 +90,7 @@ function smileybutton_jot_tool(string &$body)
for ($x = 0; $x < count($params['texts']); $x++) { for ($x = 0; $x < count($params['texts']); $x++) {
$icon = $params['icons'][$x]; $icon = $params['icons'][$x];
$s .= '<td onclick="smileybutton_addsmiley(\'' . $params['texts'][$x] . '\')">' . $icon . '</td>'; $s .= '<td onclick="smileybutton_addsmiley(\'' . $params['texts'][$x] . '\')">' . $icon . '</td>';
if (($x + 1) % (sqrt(count($params['texts'])) + 1) == 0) { if (($x + 1) % (floor(sqrt(count($params['texts']))) + 1) == 0) {
$s .= '</tr><tr>'; $s .= '</tr><tr>';
} }
} }