Skip to content

B/C fix - Modules (including core) using the "cache" XML parameter always cached, regardless of that parameter's value #24916

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 8 commits into from
Jul 22, 2019
Merged

B/C fix - Modules (including core) using the "cache" XML parameter always cached, regardless of that parameter's value #24916

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f97fca7
Check for both "cache" & "owncache" XML parameter in module
fevangelou May 15, 2019
24da208
Update ModuleHelper.php
fevangelou May 15, 2019
10bf46b
Updated file to pass validation for line length
fevangelou May 15, 2019
ea096b1
Merge branch 'staging' into staging
fevangelou May 16, 2019
0a1a9a6
Merge branch 'staging' into staging
infograf768 Jun 4, 2019
13998e4
Merge branch 'staging' into staging
fevangelou Jun 12, 2019
aeda103
Merge branch 'staging' into staging
fevangelou Jun 14, 2019
b82c9ca
Merge branch 'staging' into staging
infograf768 Jul 8, 2019
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
5 changes: 4 additions & 1 deletion libraries/src/Helper/ModuleHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,10 @@ public static function moduleCache($module, $moduleparams, $cacheparams)
$cache = \JFactory::getCache($cacheparams->cachegroup, 'callback');

// Turn cache off for internal callers if parameters are set to off and for all logged in users
if ($moduleparams->get('owncache') === 0 || $moduleparams->get('owncache') === '0' || $conf->get('caching') == 0 || $user->get('id'))
$ownCacheDisabled = $moduleparams->get('owncache') === 0 || $moduleparams->get('owncache') === '0';
$cacheDisabled = $moduleparams->get('cache') === 0 || $moduleparams->get('cache') === '0';

if ($ownCacheDisabled || $cacheDisabled || $conf->get('caching') == 0 || $user->get('id'))
{
$cache->setCaching(false);
}
Expand Down