Merge branch 'release.24.10' into release.24.12

ar2rsawseen · ar2rsawseen · commit e5fd70108694 · 2025-01-17T21:55:35.000+02:00
diff --git a/frontend/express/views/dashboard.html b/frontend/express/views/dashboard.html
@@ -1976,7 +1976,7 @@ <h4><a href="#/analytics/events/key/{{encodeURIComponent this.name}}">{{this.nam
             Countly.track_errors();
 
             //display in app messages
-            if (Countly.content.enterContentZone) {
+            if (Countly.content && Countly.content.enterContentZone) {
                 Countly.content.enterContentZone();
             }
             
@@ -2050,7 +2050,7 @@ <h4><a href="#/analytics/events/key/{{encodeURIComponent this.name}}">{{this.nam
             });
 
             //display in app messages
-            if (Countly2.content.enterContentZone) {
+            if (Countly2.content && Countly2.content.enterContentZone) {
                 Countly2.content.enterContentZone();
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1976,7 +1976,7 @@ <h4><a href="#/analytics/events/key/{{encodeURIComponent this.name}}">{{this.nam`
`1976`	`1976`	`Countly.track_errors();`
`1977`	`1977`
`1978`	`1978`	`//display in app messages`
`1979`		`- if (Countly.content.enterContentZone) {`
	`1979`	`+ if (Countly.content && Countly.content.enterContentZone) {`
`1980`	`1980`	`Countly.content.enterContentZone();`
`1981`	`1981`	`}`
`1982`	`1982`
`@@ -2050,7 +2050,7 @@ <h4><a href="#/analytics/events/key/{{encodeURIComponent this.name}}">{{this.nam`
`2050`	`2050`	`});`
`2051`	`2051`
`2052`	`2052`	`//display in app messages`
`2053`		`- if (Countly2.content.enterContentZone) {`
	`2053`	`+ if (Countly2.content && Countly2.content.enterContentZone) {`
`2054`	`2054`	`Countly2.content.enterContentZone();`
`2055`	`2055`	`}`
`2056`	`2056`