Skip to content

fix(core): lexicons and cache after install/upgrade #16920

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

Open
Ibochkarev wants to merge 2 commits into
base: 3.x
Choose a base branch
from
Open

fix(core): lexicons and cache after install/upgrade #16920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44ae239
fix(core): lexicons and cache after install/upgrade (#15465, #14952)
Ibochkarev Mar 10, 2026
3baaa79
fix(GetList): update debug log message for cache clearing when core t…
Ibochkarev Mar 10, 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
52 changes: 37 additions & 15 deletions core/src/Revolution/Processors/Workspace/Lexicon/GetList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use MODX\Revolution\Formatter\modManagerDateFormatter;
use MODX\Revolution\modLexiconEntry;
use MODX\Revolution\Processors\Processor;
use xPDO\xPDO;

/**
* Gets a list of lexicon entries
Expand Down Expand Up @@ -110,23 +111,24 @@ public function process()
);
$entries = is_array($entries) ? $entries : [];

/*
* Core namespace and empty: clear lexicon cache so loadCache() elsewhere gets fresh data,
* then retry getFileTopic once in case result depended on cache/path state (#15465).
*/
if ($this->getProperty('namespace') === 'core' && empty($entries)) {
$this->modx->lexicon->clearCache();
$this->modx->log(xPDO::LOG_LEVEL_DEBUG, 'Lexicon GetList: core topic empty, cleared cache and retried');
$entries = $this->modx->lexicon->getFileTopic(
$this->getProperty('language'),
$this->getProperty('namespace'),
$this->getProperty('topic')
);
$entries = is_array($entries) ? $entries : [];
}

/* if searching */
if (!empty($query)) {
function parseArray($needle, array $haystack = [])
{
if (!is_array($haystack)) {
return false;
}
$results = [];
foreach ($haystack as $key => $value) {
if (strpos($key, $needle) !== false || strpos($value, $needle) !== false) {
$results[$key] = $value;
}
}
return $results;
}

$entries = parseArray($query, $entries);
$entries = $this->filterEntriesByQuery($query, $entries);
}

/* add in unique entries */
Expand Down Expand Up @@ -172,4 +174,24 @@ function parseArray($needle, array $haystack = [])

return $this->outputArray($list, $count);
}

/**
* Filter lexicon entries by search query (key or value contains needle).
*
* @param string $query Search string.
* @param array $entries Name => value entries.
* @return array Filtered entries.
*/
private function filterEntriesByQuery(string $query, array $entries): array
{
$results = [];
foreach ($entries as $key => $value) {
$keyMatch = strpos((string) $key, $query) !== false;
$valueMatch = is_string($value) && strpos($value, $query) !== false;
if ($keyMatch || $valueMatch) {
$results[$key] = $value;
}
}
return $results;
}
}
18 changes: 9 additions & 9 deletions manager/templates/default/browser/index.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<meta http-equiv="Content-Type" content="text/html; charset={$_config.modx_charset}" />


<link rel="stylesheet" type="text/css" href="{$_config.manager_url}assets/ext3/resources/css/ext-all-notheme-min.css" />
<link rel="stylesheet" type="text/css" href="{$_config.manager_url}templates/default/css/index{if $_config.compress_css}-min{/if}.css" />
<link rel="stylesheet" type="text/css" href="{$_config.manager_url}assets/ext3/resources/css/ext-all-notheme-min.css?v={$versionToken}" />
<link rel="stylesheet" type="text/css" href="{$_config.manager_url}templates/default/css/index{if $_config.compress_css}-min{/if}.css?v={$versionToken}" />

{if isset($_config.ext_debug) && $_config.ext_debug}
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base-debug.js"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all-debug.js"></script>
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base-debug.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all-debug.js?v={$versionToken}"></script>
{else}
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base.js"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all.js"></script>
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all.js?v={$versionToken}"></script>
{/if}
<script src="{$_config.manager_url}assets/modext/core/modx.js"></script>
<script src="{$_config.connectors_url}lang.js.php?ctx=mgr&topic=category,file,resource&action={$smarty.get.a|strip_tags|default:''}"></script>
<script src="{$_config.connectors_url}modx.config.js.php?action={$smarty.get.a|strip_tags|default:''}{if $_ctx}&wctx={$_ctx}{/if}&HTTP_MODAUTH={$site_id|default|htmlspecialchars}"></script>
<script src="{$_config.manager_url}assets/modext/core/modx.js?v={$versionToken}"></script>
<script src="{$_config.connectors_url}lang.js.php?ctx=mgr&topic=category,file,resource&action={$smarty.get.a|strip_tags|default:''}&v={$versionToken}"></script>
<script src="{$_config.connectors_url}modx.config.js.php?action={$smarty.get.a|strip_tags|default:''}{if $_ctx}&wctx={$_ctx}{/if}&HTTP_MODAUTH={$site_id|default|htmlspecialchars}&v={$versionToken}"></script>

{$maincssjs}

Expand Down
16 changes: 8 additions & 8 deletions manager/templates/default/header.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@

{if $_config.manager_favicon_url}<link rel="shortcut icon" href="{$_config.manager_favicon_url}" />{/if}

<link rel="stylesheet" type="text/css" href="{$_config.manager_url}assets/ext3/resources/css/ext-all-notheme-min.css" />
<link rel="stylesheet" type="text/css" href="{$_config.manager_url}assets/ext3/resources/css/ext-all-notheme-min.css?v={$versionToken}" />
<link rel="stylesheet" type="text/css" href="{$indexCss}?v={$versionToken}" />

{if isset($_config.ext_debug) && $_config.ext_debug}
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base-debug.js"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all-debug.js"></script>
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base-debug.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all-debug.js?v={$versionToken}"></script>
{else}
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base.js"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all.js"></script>
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all.js?v={$versionToken}"></script>
{/if}
<script src="{$_config.manager_url}assets/modext/core/modx.js?mv={$versionToken}"></script>
<script src="{$_config.manager_url}assets/lib/popper.min.js"></script>
<script src="{$_config.connectors_url}lang.js.php?ctx=mgr&topic=topmenu,file,resource,{$_lang_topics}&action={$smarty.get.a|default|htmlspecialchars}"></script>
<script src="{$_config.connectors_url}modx.config.js.php?action={$smarty.get.a|default|htmlspecialchars}{if $_ctx}&wctx={$_ctx}{/if}&HTTP_MODAUTH={$_authToken|default|htmlspecialchars}"></script>
<script src="{$_config.manager_url}assets/lib/popper.min.js?v={$versionToken}"></script>
<script src="{$_config.connectors_url}lang.js.php?ctx=mgr&topic=topmenu,file,resource,{$_lang_topics}&action={$smarty.get.a|default|htmlspecialchars}&v={$versionToken}"></script>
<script src="{$_config.connectors_url}modx.config.js.php?action={$smarty.get.a|default|htmlspecialchars}{if $_ctx}&wctx={$_ctx}{/if}&HTTP_MODAUTH={$_authToken|default|htmlspecialchars}&v={$versionToken}"></script>

<script>
const tvPanelOverrides = [];
Expand Down
4 changes: 2 additions & 2 deletions manager/templates/default/security/login.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="apple-touch-icon" href="{$_config.manager_favicon_url}">
{/if}

<link rel="stylesheet" type="text/css" href="{$_config.manager_url}templates/default/css/login{if $_config.compress_css}-min{/if}.css">
<link rel="stylesheet" type="text/css" href="{$_config.manager_url}templates/default/css/login{if $_config.compress_css}-min{/if}.css?v={$versionToken}">
</head>
<body id="login">
{$onManagerLoginFormPrerender}
Expand Down Expand Up @@ -192,6 +192,6 @@
</div>
<div class="l-background" style="background-image:url({$background})"></div>

<script src="{$_config.manager_url}assets/modext/sections/login.js"></script>
<script src="{$_config.manager_url}assets/modext/sections/login.js?v={$versionToken}"></script>
</body>
</html>
36 changes: 18 additions & 18 deletions manager/templates/default/security/logout.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@
<head>
<title>MODx :: {$_lang.permission_denied}</title>
<meta http-equiv="Content-Type" content="text/html; charset={$_config.modx_charset}" />
<link rel="stylesheet" type="text/css" href="{$_config.manager_url}assets/ext3/resources/css/ext-all.css" />
<link rel="stylesheet" type="text/css" href="{$_config.manager_url}assets/ext3/resources/css/xtheme-gray-extend.css" />
<link rel="stylesheet" type="text/css" href="{$indexCss}" />
<link rel="stylesheet" type="text/css" href="{$loginCss}" />
<link rel="stylesheet" type="text/css" href="{$_config.manager_url}assets/ext3/resources/css/ext-all.css?v={$versionToken}" />
<link rel="stylesheet" type="text/css" href="{$_config.manager_url}assets/ext3/resources/css/xtheme-gray-extend.css?v={$versionToken}" />
<link rel="stylesheet" type="text/css" href="{$indexCss}?v={$versionToken}" />
<link rel="stylesheet" type="text/css" href="{$loginCss}?v={$versionToken}" />


{if isset($_config.ext_debug) && $_config.ext_debug}
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base-debug.js"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all-debug.js"></script>
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base-debug.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all-debug.js?v={$versionToken}"></script>
{else}
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base.js"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all.js"></script>
<script src="{$_config.manager_url}assets/ext3/adapter/ext/ext-base.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/ext3/ext-all.js?v={$versionToken}"></script>
{/if}
<script src="{$_config.manager_url}assets/modext/core/modx.js"></script>
<script src="{$_config.connectors_url}lang.js.php?topic=login"></script>
<script src="{$_config.manager_url}assets/modext/core/modx.form.handler.js"></script>
<script src="{$_config.manager_url}assets/modext/core/modx.component.js"></script>
<script src="{$_config.manager_url}assets/modext/util/utilities.js"></script>
<script src="{$_config.manager_url}assets/modext/util/spotlight.js"></script>
<script src="{$_config.manager_url}assets/modext/widgets/core/modx.panel.js"></script>
<script src="{$_config.manager_url}assets/modext/widgets/core/modx.msg.js"></script>
<script src="{$_config.manager_url}assets/modext/widgets/core/modx.window.js"></script>
<script src="{$_config.manager_url}assets/modext/sections/login.js"></script>
<script src="{$_config.manager_url}assets/modext/core/modx.js?v={$versionToken}"></script>
<script src="{$_config.connectors_url}lang.js.php?topic=login&v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/modext/core/modx.form.handler.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/modext/core/modx.component.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/modext/util/utilities.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/modext/util/spotlight.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/modext/widgets/core/modx.panel.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/modext/widgets/core/modx.msg.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/modext/widgets/core/modx.window.js?v={$versionToken}"></script>
<script src="{$_config.manager_url}assets/modext/sections/login.js?v={$versionToken}"></script>

<meta name="robots" content="noindex, nofollow" />
{literal}<style>body, html { background: #fafafa !important; }</style>{/literal}
Expand Down
5 changes: 5 additions & 0 deletions setup/includes/runner/modinstallrunnerweb.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ public function cleanup() {
],
]);

/* refresh all cache partitions (e.g. lexicon_topics) so first manager load has correct data (#14952, #15465) */
if ($this->install->xpdo->cacheManager) {
$this->install->xpdo->cacheManager->refresh();
}

$this->install->lock();

$this->install->settings->store([
Expand Down
5 changes: 5 additions & 0 deletions setup/includes/upgrade.install.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,4 +386,9 @@
$setting->save();
}

/* clear all cache partitions (including lexicon_topics) after upgrade so manager shows correct data (#14952) */
if ($modx->getCacheManager()) {
$modx->cacheManager->refresh();
}

return true;