Skip to content

Fix Progressive caching to cache modules per custom menu assignment #36193

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
merged 7 commits into from
Jan 8, 2022
Merged

Fix Progressive caching to cache modules per custom menu assignment #36193

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ccdcd5e
Fix Progressive caching to cache modules per custom menu assignment
Fedik Dec 4, 2021
a03bcbb
phpcs
Fedik Dec 4, 2021
5b95cd9
Update libraries/src/Document/HtmlDocument.php
Fedik Dec 4, 2021
6100906
remove null
Fedik Dec 4, 2021
294bfbb
Update libraries/src/Document/HtmlDocument.php
zero-24 Jan 8, 2022
02ce7fa
Update libraries/src/Document/HtmlDocument.php
zero-24 Jan 8, 2022
3d20276
Update libraries/src/Document/HtmlDocument.php
zero-24 Jan 8, 2022
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
17 changes: 15 additions & 2 deletions libraries/src/Document/HtmlDocument.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
\defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Cache\Cache;
use Joomla\CMS\Cache\CacheControllerFactoryInterface;
use Joomla\CMS\Factory as CmsFactory;
use Joomla\CMS\Filter\InputFilter;
use Joomla\CMS\Helper\ModuleHelper;
Expand Down Expand Up @@ -559,8 +560,20 @@ public function getBuffer($type = null, $name = null, $attribs = array())
if ($this->_caching == true && $type === 'modules' && $name !== 'debug')
{
/** @var \Joomla\CMS\Document\Renderer\Html\ModulesRenderer $renderer */
$cache = CmsFactory::getCache('com_modules', '');
$hash = md5(serialize(array($name, $attribs, null, get_class($renderer))));
/** @var \Joomla\CMS\Cache\Controller\OutputController $cache */
$cache = CmsFactory::getContainer()->get(CacheControllerFactoryInterface::class)
->createCacheController('output', ['defaultgroup' => 'com_modules']);
$hash = md5(
serialize(
[
$name,
$attribs,
null,
get_class($renderer),
CmsFactory::getApplication()->input->get('Itemid'),
]
)
);
$cbuffer = $cache->get('cbuffer_' . $type);

if (isset($cbuffer[$hash]))
Expand Down