From b99d31ca61f397794251058a415551dac36d23ee Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 8 Oct 2019 08:42:15 +0200
Subject: [PATCH] MOBILE-2491 filter: Use instanceid 0 for system context

---
 src/addon/blog/components/entries/entries.ts                | 2 +-
 .../components/discussions/addon-messages-discussions.html  | 4 ++--
 src/addon/messages/components/discussions/discussions.ts    | 2 --
 .../messages/pages/conversation-info/conversation-info.html | 4 ++--
 .../messages/pages/conversation-info/conversation-info.ts   | 2 --
 src/addon/messages/pages/discussion/discussion.html         | 4 ++--
 src/addon/messages/pages/discussion/discussion.ts           | 2 --
 .../pages/group-conversations/group-conversations.html      | 6 +++---
 .../pages/group-conversations/group-conversations.ts        | 2 --
 src/addon/messages/pages/search/search.html                 | 2 +-
 src/addon/messages/pages/search/search.ts                   | 3 ---
 src/addon/messages/providers/mainmenu-handler.ts            | 3 +--
 src/addon/notifications/pages/list/list.html                | 2 +-
 src/addon/notifications/pages/list/list.ts                  | 3 ---
 src/components/site-picker/site-picker.ts                   | 2 +-
 src/core/contentlinks/pages/choose-site/choose-site.html    | 2 +-
 src/core/courses/pages/dashboard/dashboard.html             | 2 +-
 src/core/courses/pages/dashboard/dashboard.ts               | 2 --
 src/core/filter/providers/filter.ts                         | 5 +++--
 src/core/filter/providers/helper.ts                         | 4 ++--
 src/core/login/pages/sites/sites.html                       | 2 +-
 src/core/login/pages/sites/sites.ts                         | 2 +-
 src/core/mainmenu/pages/more/more.html                      | 2 +-
 src/core/mainmenu/pages/more/more.ts                        | 2 --
 src/core/pushnotifications/providers/pushnotifications.ts   | 2 +-
 src/core/settings/pages/space-usage/space-usage.html        | 2 +-
 src/core/settings/pages/space-usage/space-usage.ts          | 2 +-
 .../settings/pages/synchronization/synchronization.html     | 2 +-
 src/core/sharedfiles/pages/choose-site/choose-site.html     | 2 +-
 29 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/src/addon/blog/components/entries/entries.ts b/src/addon/blog/components/entries/entries.ts
index 29b225c09..8853d8842 100644
--- a/src/addon/blog/components/entries/entries.ts
+++ b/src/addon/blog/components/entries/entries.ts
@@ -104,7 +104,7 @@ export class AddonBlogEntriesComponent implements OnInit {
             this.contextInstanceId = this.courseId;
         } else {
             this.contextLevel = 'system';
-            this.contextInstanceId = this.siteHomeId;
+            this.contextInstanceId = 0;
         }
 
         this.commentsEnabled = !this.commentsProvider.areCommentsDisabledInSite();
diff --git a/src/addon/messages/components/discussions/addon-messages-discussions.html b/src/addon/messages/components/discussions/addon-messages-discussions.html
index 8d21aaba8..0094d0dc5 100644
--- a/src/addon/messages/components/discussions/addon-messages-discussions.html
+++ b/src/addon/messages/components/discussions/addon-messages-discussions.html
@@ -15,7 +15,7 @@
             <a ion-item text-wrap *ngFor="let result of search.results" [title]="result.fullname" (click)="gotoDiscussion(result.userid, result.messageid)" [class.core-split-item-selected]="result.userid == discussionUserId" class="addon-message-discussion">
                 <ion-avatar core-user-avatar [user]="result" item-start [checkOnline]="result.showonlinestatus"></ion-avatar>
                 <h2>{{ result.fullname }}</h2>
-                <p><core-format-text clean="true" singleLine="true" [text]="result.lastmessage" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
+                <p><core-format-text clean="true" singleLine="true" [text]="result.lastmessage" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
             </a>
         </ion-list>
 
@@ -27,7 +27,7 @@
                     <span *ngIf="discussion.unread" class="core-primary-circle"></span>
                     <span *ngIf="discussion.message.timecreated > 0">{{discussion.message.timecreated / 1000 | coreDateDayOrTime}}</span>
                 </ion-note>
-                <p><core-format-text clean="true" singleLine="true" [text]="discussion.message.message" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
+                <p><core-format-text clean="true" singleLine="true" [text]="discussion.message.message" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
             </a>
         </ion-list>
 
diff --git a/src/addon/messages/components/discussions/discussions.ts b/src/addon/messages/components/discussions/discussions.ts
index 0a37c5ec3..629446b1a 100644
--- a/src/addon/messages/components/discussions/discussions.ts
+++ b/src/addon/messages/components/discussions/discussions.ts
@@ -50,7 +50,6 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
         loading: '',
         text: ''
     };
-    siteHomeId: number;
 
     constructor(private eventsProvider: CoreEventsProvider, sitesProvider: CoreSitesProvider, translate: TranslateService,
             private messagesProvider: AddonMessagesProvider, private domUtils: CoreDomUtilsProvider, navParams: NavParams,
@@ -60,7 +59,6 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
         this.search.loading =  translate.instant('core.searching');
         this.loadingMessages = translate.instant('core.loading');
         this.siteId = sitesProvider.getCurrentSiteId();
-        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
 
         // Update discussions when new message is received.
         this.newMessagesObserver = eventsProvider.on(AddonMessagesProvider.NEW_MESSAGE_EVENT, (data) => {
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.html b/src/addon/messages/pages/conversation-info/conversation-info.html
index 66dd220f2..b5885ddd1 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.html
+++ b/src/addon/messages/pages/conversation-info/conversation-info.html
@@ -18,8 +18,8 @@
             <div class="item-avatar-center">
                 <img class="avatar" [src]="conversation.imageurl" core-external-content [alt]="conversation.name" role="presentation" onError="this.src='assets/img/group-avatar.png'">
             </div>
-            <h2><core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></h2>
-            <p><core-format-text *ngIf="conversation.subname" [text]="conversation.subname" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
+            <h2><core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="0"></core-format-text></h2>
+            <p><core-format-text *ngIf="conversation.subname" [text]="conversation.subname" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
             <p>{{ 'addon.messages.numparticipants' | translate:{$a: conversation.membercount} }}</p>
         </ion-item>
 
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.ts b/src/addon/messages/pages/conversation-info/conversation-info.ts
index dcd2597dd..5dfeb450d 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.ts
+++ b/src/addon/messages/pages/conversation-info/conversation-info.ts
@@ -35,14 +35,12 @@ export class AddonMessagesConversationInfoPage implements OnInit {
     members: AddonMessagesConversationMember[] = [];
     canLoadMore = false;
     loadMoreError = false;
-    siteHomeId: number;
 
     protected conversationId: number;
 
     constructor(private messagesProvider: AddonMessagesProvider, private domUtils: CoreDomUtilsProvider, navParams: NavParams,
             protected viewCtrl: ViewController, sitesProvider: CoreSitesProvider) {
         this.conversationId = navParams.get('conversationId');
-        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
     }
 
     /**
diff --git a/src/addon/messages/pages/discussion/discussion.html b/src/addon/messages/pages/discussion/discussion.html
index 5c7ea16ad..a869dad74 100644
--- a/src/addon/messages/pages/discussion/discussion.html
+++ b/src/addon/messages/pages/discussion/discussion.html
@@ -3,7 +3,7 @@
         <ion-title>
             <img *ngIf="loaded && !otherMember && conversationImage" class="core-bar-button-image" [src]="conversationImage" [alt]="title" onError="this.src='assets/img/group-avatar.png'" core-external-content role="presentation" [siteId]="siteId || null">
             <ion-avatar *ngIf="loaded && otherMember" class="core-bar-button-image" core-user-avatar [user]="otherMember" [linkProfile]="false" [checkOnline]="otherMember.showonlinestatus" item-start (click)="showInfo && viewInfo()"></ion-avatar>
-            <core-format-text [text]="title" contextLevel="system" [contextInstanceId]="siteHomeId" (click)="showInfo && !isGroup && viewInfo()"></core-format-text>
+            <core-format-text [text]="title" contextLevel="system" [contextInstanceId]="0" (click)="showInfo && !isGroup && viewInfo()"></core-format-text>
             <core-icon *ngIf="conversation && conversation.isfavourite" name="fa-star" [label]="'core.favourites' | translate"></core-icon>
             <core-icon *ngIf="conversation && conversation.ismuted" name="volume-off" [label]="'addon.messages.mutedconversation' | translate"></core-icon>
         </ion-title>
@@ -58,7 +58,7 @@
 
                     <!-- Some messages have <p> and some others don't. Add a <p> so they all have same styles. -->
                     <p class="addon-message-text">
-                        <core-format-text (afterRender)="last && scrollToBottom()" [text]="message.text" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text>
+                        <core-format-text (afterRender)="last && scrollToBottom()" [text]="message.text" contextLevel="system" [contextInstanceId]="0"></core-format-text>
                     </p>
 
                     <button ion-button icon-only clear="true" *ngIf="!message.sending && showDelete" (click)="deleteMessage(message, index)" class="addon-messages-delete-button" [@coreSlideInOut]="'fromRight'" [attr.aria-label]=" 'addon.messages.deletemessage' | translate">
diff --git a/src/addon/messages/pages/discussion/discussion.ts b/src/addon/messages/pages/discussion/discussion.ts
index 6edc0b4ea..41013c2ac 100644
--- a/src/addon/messages/pages/discussion/discussion.ts
+++ b/src/addon/messages/pages/discussion/discussion.ts
@@ -95,7 +95,6 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     isSelf = false;
     muteEnabled = false;
     muteIcon = 'volume-off';
-    siteHomeId: number;
 
     constructor(private eventsProvider: CoreEventsProvider, sitesProvider: CoreSitesProvider, navParams: NavParams,
             private userProvider: CoreUserProvider, private navCtrl: NavController, private messagesSync: AddonMessagesSyncProvider,
@@ -108,7 +107,6 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
         this.currentUserId = sitesProvider.getCurrentSiteUserId();
         this.groupMessagingEnabled = this.messagesProvider.isGroupMessagingEnabled();
         this.muteEnabled = this.messagesProvider.isMuteConversationEnabled();
-        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
 
         this.logger = logger.getInstance('AddonMessagesDiscussionPage');
 
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.html b/src/addon/messages/pages/group-conversations/group-conversations.html
index f786c52ec..4f2405bb4 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.html
+++ b/src/addon/messages/pages/group-conversations/group-conversations.html
@@ -99,7 +99,7 @@
         <ion-avatar *ngIf="conversation.type != typeGroup" core-user-avatar [user]="conversation.otherUser" [linkProfile]="false" [checkOnline]="conversation.showonlinestatus" item-start></ion-avatar>
 
         <h2>
-            <core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text>
+            <core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="0"></core-format-text>
             <core-icon name="fa-ban" *ngIf="conversation.isblocked" [label]="'addon.messages.contactblocked' | translate"></core-icon>
             <core-icon *ngIf="conversation.ismuted" name="volume-off" [label]="'addon.messages.mutedconversation' | translate"></core-icon>
         </h2>
@@ -107,11 +107,11 @@
             <ion-badge *ngIf="conversation.unreadcount > 0">{{ conversation.unreadcount }}</ion-badge>
             <span *ngIf="conversation.lastmessagedate > 0">{{conversation.lastmessagedate | coreDateDayOrTime}}</span>
         </ion-note>
-        <p *ngIf="conversation.subname"><core-format-text [text]="conversation.subname" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
+        <p *ngIf="conversation.subname"><core-format-text [text]="conversation.subname" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
         <p class="addon-message-last-message">
             <span *ngIf="conversation.sentfromcurrentuser" class="addon-message-last-message-user">{{ 'addon.messages.you' | translate }}</span>
             <span *ngIf="!conversation.sentfromcurrentuser && conversation.type == typeGroup && conversation.members[0]" class="addon-message-last-message-user">{{ conversation.members[0].fullname + ':' }}</span>
-            <core-format-text clean="true" singleLine="true" [text]="conversation.lastmessage" class="addon-message-last-message-text" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text>
+            <core-format-text clean="true" singleLine="true" [text]="conversation.lastmessage" class="addon-message-last-message-text" contextLevel="system" [contextInstanceId]="0"></core-format-text>
         </p>
     </a>
 </ng-template>
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.ts b/src/addon/messages/pages/group-conversations/group-conversations.ts
index 02490e2d0..ececc1ac2 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.ts
+++ b/src/addon/messages/pages/group-conversations/group-conversations.ts
@@ -67,7 +67,6 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     };
     typeGroup = AddonMessagesProvider.MESSAGE_CONVERSATION_TYPE_GROUP;
     currentListEl: HTMLElement;
-    siteHomeId: number;
 
     protected loadingString: string;
     protected siteId: string;
@@ -96,7 +95,6 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
         // Conversation to load.
         this.conversationId = navParams.get('conversationId') || false;
         this.discussionUserId = !this.conversationId && (navParams.get('discussionUserId') || false);
-        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
 
         // Update conversations when new message is received.
         this.newMessagesObserver = eventsProvider.on(AddonMessagesProvider.NEW_MESSAGE_EVENT, (data) => {
diff --git a/src/addon/messages/pages/search/search.html b/src/addon/messages/pages/search/search.html
index c41e42c77..99a5675b0 100644
--- a/src/addon/messages/pages/search/search.html
+++ b/src/addon/messages/pages/search/search.html
@@ -41,7 +41,7 @@
             </ion-note>
             <p class="addon-message-last-message">
                 <span *ngIf="result.sentfromcurrentuser" class="addon-message-last-message-user">{{ 'addon.messages.you' | translate }}</span>
-                <core-format-text clean="true" singleLine="true" [text]="result.lastmessage" [highlight]="result.highlightMessage" contextLevel="system" [contextInstanceId]="siteHomeId" class="addon-message-last-message-text"></core-format-text>
+                <core-format-text clean="true" singleLine="true" [text]="result.lastmessage" [highlight]="result.highlightMessage" contextLevel="system" [contextInstanceId]="0" class="addon-message-last-message-text"></core-format-text>
             </p>
         </a>
 
diff --git a/src/addon/messages/pages/search/search.ts b/src/addon/messages/pages/search/search.ts
index 33ccb7f0d..a02203faf 100644
--- a/src/addon/messages/pages/search/search.ts
+++ b/src/addon/messages/pages/search/search.ts
@@ -58,7 +58,6 @@ export class AddonMessagesSearchPage implements OnDestroy {
         loadMoreError: false
     };
     selectedResult = null;
-    siteHomeId: number;
 
     protected memberInfoObserver;
 
@@ -67,8 +66,6 @@ export class AddonMessagesSearchPage implements OnDestroy {
     constructor(private appProvider: CoreAppProvider, private domUtils: CoreDomUtilsProvider, eventsProvider: CoreEventsProvider,
             sitesProvider: CoreSitesProvider, private messagesProvider: AddonMessagesProvider) {
 
-        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
-
         // Update block status of a user.
         this.memberInfoObserver = eventsProvider.on(AddonMessagesProvider.MEMBER_INFO_CHANGED_EVENT, (data) => {
             if (!data.userBlocked && !data.userUnblocked) {
diff --git a/src/addon/messages/providers/mainmenu-handler.ts b/src/addon/messages/providers/mainmenu-handler.ts
index 1544ce7a1..51d75825c 100644
--- a/src/addon/messages/providers/mainmenu-handler.ts
+++ b/src/addon/messages/providers/mainmenu-handler.ts
@@ -297,8 +297,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
             title: message.name || message.userfromfullname,
         };
 
-        return this.filterHelper.getFiltersAndFormatText(message.text, 'system', this.sitesProvider.getCurrentSiteHomeId(),
-                {clean: true, singleLine: true}).catch(() => {
+        return this.filterHelper.getFiltersAndFormatText(message.text, 'system', 0, {clean: true, singleLine: true}).catch(() => {
             return message.text;
         }).then((formattedText) => {
             data['text'] = formattedText;
diff --git a/src/addon/notifications/pages/list/list.html b/src/addon/notifications/pages/list/list.html
index 72b4cdce1..951c63659 100644
--- a/src/addon/notifications/pages/list/list.html
+++ b/src/addon/notifications/pages/list/list.html
@@ -30,7 +30,7 @@
                 <p *ngIf="notification.userfromfullname">{{ notification.userfromfullname }}</p>
             </ion-item>
             <ion-item text-wrap>
-                <p><core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
+                <p><core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
             </ion-item>
             <addon-notifications-actions [contextUrl]="notification.contexturl" [courseId]="notification.courseid" [data]="notification.customdata"></addon-notifications-actions>
         </ion-card>
diff --git a/src/addon/notifications/pages/list/list.ts b/src/addon/notifications/pages/list/list.ts
index 70342f5e3..2046b00bc 100644
--- a/src/addon/notifications/pages/list/list.ts
+++ b/src/addon/notifications/pages/list/list.ts
@@ -40,7 +40,6 @@ export class AddonNotificationsListPage {
     loadMoreError = false;
     canMarkAllNotificationsAsRead = false;
     loadingMarkAllNotificationsAsRead = false;
-    siteHomeId: number;
 
     protected isCurrentView: boolean;
     protected cronObserver: CoreEventObserver;
@@ -52,8 +51,6 @@ export class AddonNotificationsListPage {
             private utils: CoreUtilsProvider, private notificationsProvider: AddonNotificationsProvider,
             private pushNotificationsDelegate: CorePushNotificationsDelegate,
             private notificationsHelper: AddonNotificationsHelperProvider) {
-
-        this.siteHomeId = sitesProvider.getCurrentSite().getSiteHomeId();
     }
 
     /**
diff --git a/src/components/site-picker/site-picker.ts b/src/components/site-picker/site-picker.ts
index e3b9c62ae..aa934bf57 100644
--- a/src/components/site-picker/site-picker.ts
+++ b/src/components/site-picker/site-picker.ts
@@ -49,7 +49,7 @@ export class CoreSitePickerComponent implements OnInit {
 
             sites.forEach((site: any) => {
                 // Format the site name.
-                promises.push(this.filterHelper.getFiltersAndFormatText(site.siteName, 'system', site.siteHomeId,
+                promises.push(this.filterHelper.getFiltersAndFormatText(site.siteName, 'system', 0,
                         {clean: true, singleLine: true}, site.getId()).catch(() => {
                     return site.siteName;
                 }).then((formatted) => {
diff --git a/src/core/contentlinks/pages/choose-site/choose-site.html b/src/core/contentlinks/pages/choose-site/choose-site.html
index 198304584..5ade9add5 100644
--- a/src/core/contentlinks/pages/choose-site/choose-site.html
+++ b/src/core/contentlinks/pages/choose-site/choose-site.html
@@ -15,7 +15,7 @@
                     <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
                 </ion-avatar>
                 <h2>{{site.fullName}}</h2>
-                <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></p>
+                <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
                 <p>{{site.siteUrl}}</p>
             </a>
             <ion-item>
diff --git a/src/core/courses/pages/dashboard/dashboard.html b/src/core/courses/pages/dashboard/dashboard.html
index 0030c0b0f..401379077 100644
--- a/src/core/courses/pages/dashboard/dashboard.html
+++ b/src/core/courses/pages/dashboard/dashboard.html
@@ -1,6 +1,6 @@
     <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button *ngIf="searchEnabled" ion-button icon-only (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
diff --git a/src/core/courses/pages/dashboard/dashboard.ts b/src/core/courses/pages/dashboard/dashboard.ts
index 29906dd8e..ac309713c 100644
--- a/src/core/courses/pages/dashboard/dashboard.ts
+++ b/src/core/courses/pages/dashboard/dashboard.ts
@@ -45,7 +45,6 @@ export class CoreCoursesDashboardPage implements OnDestroy {
     tabsReady = false;
     searchEnabled: boolean;
     tabs = [];
-    siteHomeId: number;
     siteName: string;
     blocks: any[];
     dashboardEnabled = false;
@@ -134,7 +133,6 @@ export class CoreCoursesDashboardPage implements OnDestroy {
      * Load the site name.
      */
     protected loadSiteName(): void {
-        this.siteHomeId = this.sitesProvider.getCurrentSiteHomeId();
         this.siteName = this.sitesProvider.getCurrentSite().getSiteName();
     }
 
diff --git a/src/core/filter/providers/filter.ts b/src/core/filter/providers/filter.ts
index e521861eb..42802335f 100644
--- a/src/core/filter/providers/filter.ts
+++ b/src/core/filter/providers/filter.ts
@@ -197,7 +197,7 @@ export class CoreFilterProvider {
             for (let i = 0; i < contextsToSend.length; i++) {
                 const context = contextsToSend[i];
 
-                if (context.contextlevel == 'system' && context.instanceid == site.getSiteHomeId()) {
+                if (context.contextlevel == 'system') {
                     hasSystemContext = true;
 
                     // Use course site home instead. Check if it's already in the list.
@@ -212,7 +212,7 @@ export class CoreFilterProvider {
                         // Site home not in list, use it instead of system.
                         contextsToSend[i] = {
                             contextlevel: 'course',
-                            instanceid: context.instanceid
+                            instanceid: site.getSiteHomeId()
                         };
                     }
 
@@ -259,6 +259,7 @@ export class CoreFilterProvider {
 
                         // Simulate the system context based on the inherited data.
                         filter.contextlevel = 'system';
+                        filter.instanceid = 0;
                         filter.contextid = -1;
                         filter.localstate = filter.inheritedstate;
                     }
diff --git a/src/core/filter/providers/helper.ts b/src/core/filter/providers/helper.ts
index 15982e9a5..af7fbac1d 100644
--- a/src/core/filter/providers/helper.ts
+++ b/src/core/filter/providers/helper.ts
@@ -122,7 +122,7 @@ export class CoreFilterHelperProvider {
 
                 let promise: Promise<boolean>;
 
-                if (instanceId == site.getSiteHomeId() && (contextLevel == 'system' || contextLevel == 'course')) {
+                if (contextLevel == 'system' || (contextLevel == 'course' && instanceId == site.getSiteHomeId())) {
                     // No need to check the site filters because we're requesting the same context, so we'd do the same twice.
                     promise = Promise.resolve(true);
                 } else {
@@ -223,7 +223,7 @@ export class CoreFilterHelperProvider {
         return this.sitesProvider.getSite(siteId).then((site) => {
 
             // Get filters at site level.
-            return this.filterProvider.getAvailableInContext('system', site.getSiteHomeId(), site.getId()).then((filters) => {
+            return this.filterProvider.getAvailableInContext('system', 0, site.getId()).then((filters) => {
 
                 return this.filterDelegate.shouldBeApplied(filters, options, site);
             });
diff --git a/src/core/login/pages/sites/sites.html b/src/core/login/pages/sites/sites.html
index f42010609..6b33ab936 100644
--- a/src/core/login/pages/sites/sites.html
+++ b/src/core/login/pages/sites/sites.html
@@ -19,7 +19,7 @@
                 <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
             </ion-avatar>
             <h2>{{site.fullName}}</h2>
-            <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></p>
+            <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
             <p>{{site.siteUrl}}</p>
             <ion-badge item-end *ngIf="!showDelete && site.badge">{{site.badge}}</ion-badge>
             <button *ngIf="showDelete" item-end ion-button icon-only clear color="danger" (click)="deleteSite($event, idx)" [attr.aria-label]="'core.delete' | translate">
diff --git a/src/core/login/pages/sites/sites.ts b/src/core/login/pages/sites/sites.ts
index 8283f15be..c420339af 100644
--- a/src/core/login/pages/sites/sites.ts
+++ b/src/core/login/pages/sites/sites.ts
@@ -86,7 +86,7 @@ export class CoreLoginSitesPage {
         const site = this.sites[index],
             siteName = site.siteName;
 
-        this.filterHelper.getFiltersAndFormatText(siteName, 'system', site.siteHomeId, {clean: true, singleLine: true}, site.id)
+        this.filterHelper.getFiltersAndFormatText(siteName, 'system', 0, {clean: true, singleLine: true}, site.id)
                 .then((siteName) => {
 
             this.domUtils.showConfirm(this.translate.instant('core.login.confirmdeletesite', { sitename: siteName })).then(() => {
diff --git a/src/core/mainmenu/pages/more/more.html b/src/core/mainmenu/pages/more/more.html
index 1caee57d6..d82dce05d 100644
--- a/src/core/mainmenu/pages/more/more.html
+++ b/src/core/mainmenu/pages/more/more.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/mainmenu/pages/more/more.ts b/src/core/mainmenu/pages/more/more.ts
index 82dc72029..257fb27c7 100644
--- a/src/core/mainmenu/pages/more/more.ts
+++ b/src/core/mainmenu/pages/more/more.ts
@@ -33,7 +33,6 @@ export class CoreMainMenuMorePage implements OnDestroy {
     handlersLoaded: boolean;
     siteInfo: any;
     siteName: string;
-    siteHomeId: number;
     logoutLabel: string;
     showWeb: boolean;
     showHelp: boolean;
@@ -111,7 +110,6 @@ export class CoreMainMenuMorePage implements OnDestroy {
         this.siteInfo = currentSite.getInfo();
         this.siteName = currentSite.getSiteName();
         this.siteUrl = currentSite.getURL();
-        this.siteHomeId = currentSite.getSiteHomeId();
         this.logoutLabel = 'core.mainmenu.' + (config && config.tool_mobile_forcelogout == '1' ? 'logout' : 'changesite');
         this.showWeb = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_website');
         this.showHelp = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_help');
diff --git a/src/core/pushnotifications/providers/pushnotifications.ts b/src/core/pushnotifications/providers/pushnotifications.ts
index 982041ac2..755300520 100644
--- a/src/core/pushnotifications/providers/pushnotifications.ts
+++ b/src/core/pushnotifications/providers/pushnotifications.ts
@@ -453,7 +453,7 @@ export class CorePushNotificationsProvider {
                             clean: true,
                             singleLine: true,
                             contextLevel: 'system',
-                            instanceId: site.getSiteHomeId(),
+                            instanceId: 0,
                             filter: true
                         },
                         isAndroid = this.platform.is('android'),
diff --git a/src/core/settings/pages/space-usage/space-usage.html b/src/core/settings/pages/space-usage/space-usage.html
index 83fcfd9ee..bc5c89b2e 100644
--- a/src/core/settings/pages/space-usage/space-usage.html
+++ b/src/core/settings/pages/space-usage/space-usage.html
@@ -9,7 +9,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="usageLoaded">
         <ion-item *ngFor="let site of sites" [class.core-primary-selected-item]="site.id == currentSiteId">
-            <h2 text-wrap><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></h2>
+            <h2 text-wrap><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></h2>
             <p text-wrap>{{ site.fullName }}</p>
             <div item-end>
                 <p>{{ site.spaceUsage | coreBytesToSize }}</p>
diff --git a/src/core/settings/pages/space-usage/space-usage.ts b/src/core/settings/pages/space-usage/space-usage.ts
index 44a24784f..4031e5157 100644
--- a/src/core/settings/pages/space-usage/space-usage.ts
+++ b/src/core/settings/pages/space-usage/space-usage.ts
@@ -167,7 +167,7 @@ export class CoreSettingsSpaceUsagePage {
      * @param siteData Site object with space usage.
      */
     deleteSiteStorage(siteData: any): void {
-        this.filterHelper.getFiltersAndFormatText(siteData.siteName, 'system', siteData.siteHomeId,
+        this.filterHelper.getFiltersAndFormatText(siteData.siteName, 'system', 0,
                 {clean: true, singleLine: true}, siteData.id).then((siteName) => {
 
             const title = this.translate.instant('core.settings.deletesitefilestitle');
diff --git a/src/core/settings/pages/synchronization/synchronization.html b/src/core/settings/pages/synchronization/synchronization.html
index 041c048c8..d34b69979 100644
--- a/src/core/settings/pages/synchronization/synchronization.html
+++ b/src/core/settings/pages/synchronization/synchronization.html
@@ -17,7 +17,7 @@
             <p>{{ 'core.settings.sites' | translate }}</p>
         </ion-item-divider>
         <ion-item *ngFor="let site of sites" [class.core-primary-selected-item]="site.id == currentSiteId" text-wrap>
-            <h2><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></h2>
+            <h2><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></h2>
             <p>{{ site.fullName }}</p>
             <p>{{ site.siteUrl }}</p>
             <button ion-button icon-only clear item-end *ngIf="!isSynchronizing(site.id)" (click)="synchronize(site.id)" [title]="site.siteName" [attr.aria-label]="'core.settings.synchronizenow' | translate">
diff --git a/src/core/sharedfiles/pages/choose-site/choose-site.html b/src/core/sharedfiles/pages/choose-site/choose-site.html
index 5c6cf3a80..c1428765e 100644
--- a/src/core/sharedfiles/pages/choose-site/choose-site.html
+++ b/src/core/sharedfiles/pages/choose-site/choose-site.html
@@ -15,7 +15,7 @@
                     <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
                 </ion-avatar>
                 <h2>{{site.fullName}}</h2>
-                <p><core-format-text clean="true" [text]="site.siteName" [siteId]="site.id" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></p>
+                <p><core-format-text clean="true" [text]="site.siteName" [siteId]="site.id" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
                 <p>{{site.siteUrl}}</p>
             </a>
         </ion-list>