Merge pull request #5810 from matrix-org/t3chguy/fix/167414

jryans · web-flow · commit 7c3a7b54e7cf · 2021-03-30T11:59:09.000+01:00
Fix the theme engine breaking with some web theming extensions
diff --git a/src/theme.js b/src/theme.js
@@ -176,7 +176,7 @@ export async function setTheme(theme) {
     for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
         const href = a.getAttribute("href");
         // shouldn't we be using the 'title' tag rather than the href?
-        const match = href.match(/^bundles\/.*\/theme-(.*)\.css$/);
+        const match = href && href.match(/^bundles\/.*\/theme-(.*)\.css$/);
         if (match) {
             styleElements[match[1]] = a;
         }

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ export async function setTheme(theme) {`
`176`	`176`	`for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {`
`177`	`177`	`const href = a.getAttribute("href");`
`178`	`178`	`// shouldn't we be using the 'title' tag rather than the href?`
`179`		`- const match = href.match(/^bundles\/.\/theme-(.)\.css$/);`
	`179`	`+ const match = href && href.match(/^bundles\/.\/theme-(.)\.css$/);`
`180`	`180`	`if (match) {`
`181`	`181`	`styleElements[match[1]] = a;`
`182`	`182`	`}`