Skip to content

[3.10] Fix Progressive caching to cache modules per custom menu assignment #36324

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

[3.10] Fix Progressive caching to cache modules per custom menu assignment #36324

Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
60d445c
Fix progressive caching
Fedik Dec 15, 2021
e84cdea
Update libraries/src/Document/HtmlDocument.php
Fedik Dec 16, 2021
ccb0cf6
Merge branch '3.10-dev' into cache-fix-310
zero-24 Jan 5, 2022
f457d8e
Merge branch '3.10-dev' into cache-fix-310
zero-24 Jan 5, 2022
ff05386
Merge remote-tracking branch 'joomla/3.10-dev' into cache-fix-310
Fedik Jan 6, 2022
54e284b
cast int
Fedik Jan 6, 2022
2752bcb
Update libraries/src/Document/HtmlDocument.php
zero-24 Jan 8, 2022
5a4945e
Update libraries/src/Document/HtmlDocument.php
zero-24 Jan 8, 2022
967a995
Update libraries/src/Document/HtmlDocument.php
zero-24 Jan 8, 2022
563e7b8
Update libraries/src/Document/HtmlDocument.php
zero-24 Jan 8, 2022
2f73e75
Update libraries/src/Document/HtmlDocument.php
zero-24 Jan 8, 2022
671a60b
Update libraries/src/Document/HtmlDocument.php
zero-24 Jan 8, 2022
92ae84f
Merge branch '3.10-dev' into cache-fix-310
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
15 changes: 13 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\Factory;
use Joomla\CMS\Helper\ModuleHelper;
use Joomla\CMS\Log\Log;
use Joomla\CMS\Uri\Uri;
Expand Down Expand Up @@ -471,8 +472,18 @@ public function getBuffer($type = null, $name = null, $attribs = array())

if ($this->_caching == true && $type == 'modules' && $name !== 'debug')
{
$cache = \JFactory::getCache('com_modules', '');
$hash = md5(serialize(array($name, $attribs, null, get_class($renderer))));
$cache = Factory::getCache('com_modules', '');
$itemId = (int) Factory::getApplication()->input->get('Itemid', 0, 'int');
$hash = md5(
serialize(
array(
$name,
$attribs,
\get_class($renderer),
$itemId
)
)
);
$cbuffer = $cache->get('cbuffer_' . $type);

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