Skip to content

[stable15] SCSS cache buster is a combination of apps/theming/scc_vars #13209

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
rullzer merged 1 commit into from
Dec 22, 2018
Merged

[stable15] SCSS cache buster is a combination of apps/theming/scc_vars #13209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
SCSS cache buster is a combination of apps/theming/scc_vars 
Else on scss files we'd get <file>?v=<hash>?v=<hash2>
This is of course not valid. Now it becomes <file>?v=<hash>-<hash2>

Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer authored and Backportbot committed Dec 21, 2018
commit 77a81d00cf9725e87bbb153962773eca695ba0c6
9 changes: 8 additions & 1 deletion lib/private/TemplateLayout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,14 @@ public function __construct( $renderAs, $appId = '' ) {
if (substr($file, -strlen('print.css')) === 'print.css') {
$this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
} else {
$this->append( 'cssfiles', $web.'/'.$file . $this->getVersionHashSuffix($web, $file) );
$suffix = $this->getVersionHashSuffix($web, $file);

if (strpos($file, '?v=') == false) {
$this->append( 'cssfiles', $web.'/'.$file . $suffix);
} else {
$this->append( 'cssfiles', $web.'/'.$file . '-' . substr($suffix, 3));
}

}
}
}
Expand Down