mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-20 15:52:24 +02:00
N°9128 - Update CKEditor5 to v48 (#896)
* N°9128 - Update CKEditor5 to v48 * Move some CSS vars to ckeditor, align variable overload in portal and backoffice * Add specifics to 3.2 portal * Update CKEditor5 build files * Update scssphp with patched version that handles pseudo selectors and attribute selectors * Update scssphp patched version to fix missing $this * Fix translations specific language file import * Remove unused maximize parameters * Update CKEditor5 build files * Fix font size/color for 3.2 portal * Avoid CKEditor styles from bleeding into fields
This commit is contained in:
@@ -939,7 +939,7 @@ class Compiler
|
||||
// if the new part is just including a previous part don't try to extend anymore
|
||||
if (\count($part) > 1) {
|
||||
foreach ($partsPile as $previousPart) {
|
||||
if (! \count(array_diff($previousPart, $part))) {
|
||||
if (! \count($this->diff_recursive($previousPart, $part))) {
|
||||
continue 2;
|
||||
}
|
||||
}
|
||||
@@ -10511,4 +10511,20 @@ TXT;
|
||||
|
||||
return [Type::T_LIST, ',', $listParts];
|
||||
}
|
||||
|
||||
protected function diff_recursive($array1, $array2) {
|
||||
$difference=array();
|
||||
foreach($array1 as $key => $value) {
|
||||
if(is_array($value) && isset($array2[$key])){ // it's an array and both have the key
|
||||
$new_diff = $this->diff_recursive($value, $array2[$key]);
|
||||
if( !empty($new_diff) )
|
||||
$difference[$key] = $new_diff;
|
||||
} else if(is_string($value) && !in_array($value, $array2)) { // the value is a string and it's not in array B
|
||||
$difference[$key] = $value . " is missing from the second array";
|
||||
} else if(!is_numeric($key) && !array_key_exists($key, $array2)) { // the key is not numberic and is missing from array B
|
||||
$difference[$key] = "Missing from the second array";
|
||||
}
|
||||
}
|
||||
return $difference;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user