Skip to content

Sync 3.5 to 3.6 #2542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Seiger merged 15 commits into from
Nov 2, 2026
Merged

Sync 3.5 to 3.6 #2542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
27e23c3
fix(i18n): translation drift and @composer
elcreator Oct 31, 2026
6413fdc
Merge pull request #2536 from elcreator/fix-translation-drift
Seiger Oct 31, 2026
92edc82
Allow access to image files in .htaccess
Shin777 Oct 22, 2026
abde240
Merge pull request #2538 from elcreator/3.5.x
elcreator Nov 2, 2026
98fd0b8
fix(manager): fix tree drag-n-drop to make resource a folder, inserti…
elcreator Nov 2, 2026
3c3e4d1
fix(vendor): drop stray blank lines from composer LICENSE
elcreator Nov 2, 2026
502b4ad
fix(tests): align thumbnail cache test with image allowlist in assets…
elcreator Nov 2, 2026
182b498
Merge pull request #2540 from elcreator/fix-thumbnail-cache-test
elcreator Nov 2, 2026
fde70f8
Merge branch '3.5.x' into fix-tree-and-file-managers
elcreator Nov 2, 2026
36cbea7
Merge pull request #2539 from elcreator/fix-tree-and-file-managers
Seiger Nov 2, 2026
79df1a2
Merge branch '3.5.x' into sync-3.5-to-3.6
elcreator Nov 2, 2026
0be7db2
fix(manager): stop stale page locks, alert loops and double alerts
elcreator Nov 2, 2026
ad363bd
fix(manager): replace Font Awesome leftovers in tree drop marker, plu…
elcreator Nov 2, 2026
6efad23
Merge branch 'fix-infinite-locks-and-loop' into sync-3.5-to-3.6
elcreator Nov 2, 2026
d2b8cf9
Merge branch '3.6.x' into sync-3.5-to-3.6
elcreator Nov 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions assets/plugins/extrascheck/CheckOutdated.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function snippet($name, $options)
if (!is_null($snippet)) {
$tpl = isset($options['template']) ? $options['template'] :
'@CODE:<div class="widget-wrapper alert alert-warning">' .
'<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> ' .
'<i class="evo-icon evo-icon-alert-triangle" aria-hidden="true"></i> ' .
'[+snippet+] <b>[+name+]</b> (version [+currentVersion+]) ' .
' [+isSecurity:empty:then=`[+isoutdated+] <b>Evolution [+evo_cms_version+]</b>`:else=`<u><b>[+security_reason+]</b></u>.`+]' .
'<br />[+please_update+] <b>[+name+]</b> [+to_latest+]' .
Expand Down Expand Up @@ -124,7 +124,7 @@ public function plugin($name, $options)
if (!is_null($plugin)) {
$tpl = isset($options['template']) ? $options['template'] :
'@CODE:<div class="widget-wrapper alert alert-warning">' .
'<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> ' .
'<i class="evo-icon evo-icon-alert-triangle" aria-hidden="true"></i> ' .
'[+plugin+] <b>[+name+]</b> (version [+currentVersion+]) ' .
' [+isSecurity:empty:then=`[+isoutdated+] <b>Evolution [+evo_cms_version+]</b>`:else=`<u><b>[+security_reason+]</b></u>.`+]' .
'<br />[+please_update+] <b>[+name+]</b> [+to_latest+]' .
Expand Down Expand Up @@ -174,7 +174,7 @@ public function module($name, $options)
if (!is_null($module)) {
$tpl = isset($options['template']) ? $options['template'] :
'@CODE:<div class="widget-wrapper alert alert-warning">' .
'<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> ' .
'<i class="evo-icon evo-icon-alert-triangle" aria-hidden="true"></i> ' .
'[+lock_element_type_6+] <b>[+name+]</b> (version [+currentVersion+]) ' .
' [+isSecurity:empty:then=`[+isoutdated+] <b>Evolution [+evo_cms_version+]</b>`:else=`<u><b>[+security_reason+]</b></u>.`+]' .
'<br />[+please_update+] <b>[+name+]</b> [+to_latest+]' .
Expand Down Expand Up @@ -224,7 +224,7 @@ public function file($path, $options = [])

$tpl = isset($options['template']) ? $options['template'] :
'@CODE:<div class="widget-wrapper alert alert-danger">' .
'<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> ' .
'<i class="evo-icon evo-icon-alert-triangle" aria-hidden="true"></i> ' .
'<b>[+path+]</b> ' .
' [+isSecurity:empty:then=`[+isoutdated+] <b>Evolution [+evo_cms_version+]</b>`:else=`<u><b>[+security_reason+]</b></u>.`+]' .
'<br />[+please_delete+]. [+if_dont_use+]' .
Expand All @@ -249,7 +249,7 @@ public function theme($theme, $options = [])

$tpl = isset($options['template']) ? $options['template'] :
'@CODE: <div class="widget-wrapper alert alert-danger">' .
'<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> ' .
'<i class="evo-icon evo-icon-alert-triangle" aria-hidden="true"></i> ' .
'[+manager_theme+] <b>[+theme+]</b> ' .
'[+isSecurity:empty:then=`[+isoutdated+] <b>Evolution [+evo_cms_version+]</b>`:else=`- <u><b>[+security_reason+]</b></u>.`+]' .
'<br />[+please_delete+] [+from_folder+] [+path+]. [+if_dont_use+]' .
Expand Down Expand Up @@ -279,7 +279,7 @@ public function rss($key, $options)
if (isset($options['old']) && $this->modx->getConfig($key) === $options['old']) {
$tpl = isset($options['template']) ? $options['template'] :
'@CODE:<div class="widget-wrapper alert alert-warning">' .
'<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> ' .
'<i class="evo-icon evo-icon-alert-triangle" aria-hidden="true"></i> ' .
'<b>[+settings_config+] > [+' . $key . '_title+]</b> ' .
'([+oldUrl+]) [+outdated+]. ' .
'[+please_download_and_install+] <b>UpdateEvosRss</b> [+from+]' .
Expand Down Expand Up @@ -364,7 +364,7 @@ public function makeConfigButton($title)
$popup = [
'url' => EVO_MANAGER_URL . '?a=102&id=' . $this->getPluginId() . '&tab=1',
'title1' => $title,
'icon' => 'fa-cog',
'icon' => 'evo-icon-settings',
'iframe' => 'iframe',
'selector2' => '#tabConfig',
'position' => 'center',
Expand All @@ -385,7 +385,7 @@ public function makeConfigButton($title)
str_replace('"', "'", stripslashes(json_encode($popup))) .
')" ' .
'>' .
'<i class="fa fa-cog fa-spin-hover"></i> ' .
'<i class="evo-icon evo-icon-settings evo-icon-spin-hover"></i> ' .
'</a>';
}

Expand Down
2 changes: 1 addition & 1 deletion assets/plugins/extrascheck/OutdatedExtrasCheck.plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
'cols' => 'col-lg-12',
'headAttr' => 'style="color:#E84B39;"',
'bodyAttr' => '',
'icon' => 'fa-warning',
'icon' => 'evo-icon-alert-triangle',
'title' => '' . $wdgTitle . ' ' . $button . '',
'body' => '<div class="card-body">' . $out . '</div>',
'hide' => '0'
Expand Down
28 changes: 14 additions & 14 deletions assets/plugins/updater/plugin.updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ function poll() {
'menuindex' => '1',
'id' => 'updater',
'cols' => 'col-sm-12',
'icon' => 'fa-exclamation-triangle',
'icon' => 'evo-icon-alert-triangle',
'title' => $_lang['system_update'],
'body' => $output
];
Expand Down Expand Up @@ -952,7 +952,7 @@ function poll() {
'menuindex' => '1000',
'id' => 'updater',
'cols' => 'col-sm-12',
'icon' => 'fa-exclamation-triangle',
'icon' => 'evo-icon-alert-triangle',
'title' => $_lang['system_update'],
'body' => $output
];
Expand Down Expand Up @@ -1160,14 +1160,14 @@ function poll() {
. '</div>';

$supportButtonHtml = '<a class="btn btn-sm btn-warning" href="' . $safeSupportUrl . '" target="_blank" rel="noopener noreferrer">'
. '<i class="fa fa-envelope"></i> ' . htmlspecialchars($_lang['updater_action_support'], ENT_QUOTES, 'UTF-8') . '</a>';
. '<i class="evo-icon evo-icon-mail"></i> ' . htmlspecialchars($_lang['updater_action_support'], ENT_QUOTES, 'UTF-8') . '</a>';

$releaseButtonsHtml = '<div style="margin-left:auto;display:flex;gap:10px;align-items:center;flex-wrap:wrap;">'
. '<a class="btn btn-xs btn-primary" href="' . $safeReleaseUrl . '" target="_blank" rel="noopener noreferrer">'
. '<i class="fa fa-external-link"></i> ' . htmlspecialchars($primaryReleaseLabel, ENT_QUOTES, 'UTF-8')
. '<i class="evo-icon evo-icon-external-link"></i> ' . htmlspecialchars($primaryReleaseLabel, ENT_QUOTES, 'UTF-8')
. '</a>'
. '<a href="' . $safeFallbackUrl . '" target="_blank" rel="noopener noreferrer" style="font-size:12px;text-decoration:underline;color:#0d6efd;">'
. '<i class="fa fa-list"></i> ' . htmlspecialchars($secondaryReleaseLabel, ENT_QUOTES, 'UTF-8')
. '<i class="evo-icon evo-icon-list"></i> ' . htmlspecialchars($secondaryReleaseLabel, ENT_QUOTES, 'UTF-8')
. '</a>'
. '</div>';

Expand All @@ -1180,14 +1180,14 @@ function poll() {
$safeCliCommand = htmlspecialchars($cliCommand, ENT_QUOTES, 'UTF-8');
$branchModeNoticeHtml = '';
if ($isLineMode) {
$branchModeNoticeHtml = '<p style="margin:0 0 8px 0;color:#856404;font-weight:600;"><i class="fa fa-code-fork"></i> '
$branchModeNoticeHtml = '<p style="margin:0 0 8px 0;color:#856404;font-weight:600;"><i class="evo-icon evo-icon-git-fork"></i> '
. htmlspecialchars(sprintf(
updaterLang($_lang, 'updater_line_mode_notice', 'This site follows %s, which has new commits. To return to a release, run php artisan make:site update <release> in the core folder.'),
$version === 'evolution-cms/evolution' ? $latestVersionRaw : $version . ' ' . $latestVersionRaw
), ENT_QUOTES, 'UTF-8')
. '</p>';
} elseif ($isBranchMode) {
$branchModeNoticeHtml = '<p style="margin:0 0 8px 0;color:#856404;font-weight:600;"><i class="fa fa-code-fork"></i> '
$branchModeNoticeHtml = '<p style="margin:0 0 8px 0;color:#856404;font-weight:600;"><i class="evo-icon evo-icon-git-fork"></i> '
. htmlspecialchars(updaterLang($_lang, 'updater_branch_mode_notice', 'Development branch/ref update mode is enabled. Use it only for testing or controlled maintenance.'), ENT_QUOTES, 'UTF-8')
. '</p>';
}
Expand All @@ -1199,7 +1199,7 @@ function poll() {

if ($canShowUpdateActions) {
$primaryUpdateButtonHtml = '<a class="btn btn-sm btn-success" href="#" onclick="var panel=document.getElementById(\'updater-cli-panel\');if(panel){panel.style.display=(panel.style.display===\'block\'?\'none\':\'block\');}return false;">'
. '<i class="fa fa-terminal"></i> ' . htmlspecialchars(updaterLang($_lang, 'updater_cli_summary', 'Manual update (CLI)'), ENT_QUOTES, 'UTF-8')
. '<i class="evo-icon evo-icon-terminal-2"></i> ' . htmlspecialchars(updaterLang($_lang, 'updater_cli_summary', 'Manual update (CLI)'), ENT_QUOTES, 'UTF-8')
. '</a>';
$cliPanelHtml = '<div id="updater-cli-panel" style="display:none;margin-top:12px;padding:8px;border:1px dashed #bdbdbd;border-radius:6px;">'
. '<div style="margin-bottom:6px;">' . htmlspecialchars(updaterLang($_lang, 'updater_cli_intro', 'If you are updating manually, run this command in terminal:'), ENT_QUOTES, 'UTF-8') . '</div>'
Expand Down Expand Up @@ -1246,7 +1246,7 @@ function poll() {
'invalid_response' => updaterLang($_lang, 'updater_live_update_invalid_response', 'Manager returned an invalid update response.'),
]);
$managerUpdateButtonHtml = '<button type="button" class="btn btn-sm btn-primary" onclick="return window.EvoUpdaterSystemTask && window.EvoUpdaterSystemTask.openConfirm ? window.EvoUpdaterSystemTask.openConfirm() : false;">'
. '<i class="fa fa-refresh"></i> ' . htmlspecialchars(updaterLang($_lang, 'updater_live_update_button', 'Manual update (WEB)'), ENT_QUOTES, 'UTF-8')
. '<i class="evo-icon evo-icon-refresh"></i> ' . htmlspecialchars(updaterLang($_lang, 'updater_live_update_button', 'Manual update (WEB)'), ENT_QUOTES, 'UTF-8')
. '</button>';
}
}
Expand All @@ -1256,7 +1256,7 @@ function poll() {
. '<div style="display:flex;gap:10px;flex-wrap:wrap;align-items:center;">'
. '<div style="display:flex;gap:10px;flex-wrap:wrap;align-items:center;">'
. '<strong style="color:#dc3545;">' . $safeCurrentWithDate . '</strong>'
. '<i class="fa fa-arrow-right" aria-hidden="true"></i>'
. '<i class="evo-icon evo-icon-arrow-right" aria-hidden="true"></i>'
. '<strong style="color:#28a745;">' . $safeLatestWithDate . '</strong>'
. '</div>'
. $releaseButtonsHtml
Expand All @@ -1265,14 +1265,14 @@ function poll() {

. '<div style="margin:0 0 12px 0;">'
. $branchModeNoticeHtml
. '<p style="margin:0 0 8px 0;"><i class="fa fa-check-circle"></i> '
. '<p style="margin:0 0 8px 0;"><i class="evo-icon evo-icon-circle-check"></i> '
. htmlspecialchars($_lang['updater_notice_text_1'], ENT_QUOTES, 'UTF-8') . '</p>'
. '<p style="margin:0 0 8px 0;"><i class="fa fa-database"></i> '
. '<p style="margin:0 0 8px 0;"><i class="evo-icon evo-icon-database"></i> '
. htmlspecialchars($_lang['updater_notice_text_2'], ENT_QUOTES, 'UTF-8')
. '<span style="display:block;margin-top:4px;color:#dc3545;font-weight:600;">'
. updaterBuildBackupWarningHtml($_lang)
. '</span></p>'
. '<p style="margin:0;"><i class="fa fa-user"></i> '
. '<p style="margin:0;"><i class="evo-icon evo-icon-user"></i> '
. htmlspecialchars($_lang['updater_notice_text_3'], ENT_QUOTES, 'UTF-8') . '</p>'
. '</div>'

Expand All @@ -1293,7 +1293,7 @@ function poll() {
'menuindex' => '1',
'id' => 'updater',
'cols' => 'col-sm-12',
'icon' => 'fa-exclamation-triangle',
'icon' => 'evo-icon-alert-triangle',
'title' => $_lang['updater_widget_title'],
'body' => $output
];
Expand Down
Loading
Loading