composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source
This commit is contained in:
jf-cbd
2025-01-21 17:43:35 +01:00
parent fb180e8370 470f145747
commit 4c8392b332
8 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/utils.inc.php
View File

@@ -3110,8 +3110,7 @@ TXT
$aMentionMatches = [];
$sText = html_entity_decode($sText);
preg_match_all('/<a\s*([^>]*)data-object-class="([^"]*)"\s*data-object-key="([^"]*)"/i', $sText, $aMentionMatches);
preg_match_all('/<a\s*([^>]*)data-object-class="([^"]*)"\s.*data-object-key="([^"]*)"/Ui', $sText, $aMentionMatches);
foreach ($aMentionMatches[0] as $iMatchIdx => $sCompleteMatch) {
$sMatchedClass = $aMentionMatches[2][$iMatchIdx];
$sMatchedId = $aMentionMatches[3][$iMatchIdx];

2
core/htmlsanitizer.class.inc.php
View File

@@ -354,6 +354,8 @@ class HTMLDOMSanitizer extends DOMSanitizer
'font-style',
'height',
'margin',
'margin-left',
'margin-right',
'padding',
'text-align',
'vertical-align',

2
node_modules/.package-lock.json generated vendored
View File

@@ -71,7 +71,7 @@
},
"node_modules/ckeditor5-itop-build": {
"version": "3.2.0",
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#7dcf9fc9b0010e121f1d8a4d28eca0219fcb6e35",
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#deab849bf05e66948c5e66a57079ad1baea66b94",
"license": "SEE LICENSE IN LICENSE.md"
},
"node_modules/clipboard": {

4
node_modules/ckeditor5-itop-build/build/ckeditor.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/ckeditor5-itop-build/build/ckeditor.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/ckeditor5-itop-build/build/styles/compiled-theme.scss generated vendored
View File

File diff suppressed because one or more lines are too long

6
package-lock.json generated
View File

@@ -104,7 +104,7 @@
},
"node_modules/ckeditor5-itop-build": {
"version": "3.2.0",
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#7dcf9fc9b0010e121f1d8a4d28eca0219fcb6e35",
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#deab849bf05e66948c5e66a57079ad1baea66b94",
"license": "SEE LICENSE IN LICENSE.md"
},
"node_modules/clipboard": {
@@ -357,8 +357,8 @@
}
},
"ckeditor5-itop-build": {
"version": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#7dcf9fc9b0010e121f1d8a4d28eca0219fcb6e35",
"from": "ckeditor5-itop-build@https://github.com/Combodo/ckeditor5-itop-build.git"
"version": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#deab849bf05e66948c5e66a57079ad1baea66b94",
"from": "ckeditor5-itop-build@github:Combodo/ckeditor5-itop-build"
},
"clipboard": {
"version": "2.0.11",

2
tests/php-unit-tests/unitary-tests/application/utilsTest.php
View File

@@ -695,7 +695,7 @@ HTML,
],
'1 UserRequest, 1 Person' => [
<<<HTML
<div class="ibo-activity-entry--main-information-content"><div class="ibo-activity-entry--main-information-content"><p>Beginning</p><p>Before link <a data-role="object-mention" data-object-class="UserRequest" data-object-key="12345" data-object-id="#Test Ticket" href="$sAbsUrlAppRoot/pages/UI.php?operation=details&class=UserRequest&id=12345">#Test Ticket</a> After link</p><p>And <a data-role="object-mention" data-object-class="Person" data-object-key="3" data-object-id="@Agatha Christie" href="$sAbsUrlAppRoot/pages/UI.php?operation=details&class=Person&id=3">@Agatha Christie</a></p><p>End</p></div></div>
<div class="ibo-activity-entry--main-information-content"><div class="ibo-activity-entry--main-information-content"><p>Beginning</p><p>Before link <a data-role="object-mention" data-object-class="UserRequest" data-object-key="12345" data-object-id="#Test Ticket" href="$sAbsUrlAppRoot/pages/UI.php?operation=details&class=UserRequest&id=12345">#Test Ticket</a> After link</p><p>And <a data-role="object-mention" data-object-class="Person" data-object-id="@Agatha Christie" data-object-key="3" data-object-id="@Agatha Christie" href="$sAbsUrlAppRoot/pages/UI.php?operation=details&class=Person&id=3">@Agatha Christie</a></p><p>End</p></div></div>
HTML,
[
'UserRequest' => ['12345'],