Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
- 
83880497
by Arthur Edelstein at 2023-02-02T15:24:05+01:00
3 changed files:
- browser/base/content/appmenu-viewcache.inc.xhtml
- browser/base/content/browser-menubar.inc
- browser/base/content/browser-safebrowsing.js
Changes:
| ... | ... | @@ -55,7 +55,8 @@ | 
| 55 | 55 |                       class="subviewbutton"
 | 
| 56 | 56 |                       data-l10n-id="appmenuitem-new-private-window"
 | 
| 57 | 57 |                       key="key_privatebrowsing"
 | 
| 58 | -                     command="Tools:PrivateBrowsing"/>
 | |
| 58 | +                     command="Tools:PrivateBrowsing"
 | |
| 59 | +                     hidden="true"/>
 | |
| 59 | 60 |        <toolbarseparator/>
 | 
| 60 | 61 |        <toolbarbutton id="appMenu-new-identity"
 | 
| 61 | 62 |                       class="subviewbutton"
 | 
| ... | ... | @@ -179,7 +180,8 @@ | 
| 179 | 180 |        <toolbarbutton id="appMenu-restoreSession"
 | 
| 180 | 181 |                       data-l10n-id="appmenu-restore-session"
 | 
| 181 | 182 |                       class="subviewbutton"
 | 
| 182 | -                     command="Browser:RestoreLastSession"/>
 | |
| 183 | +                     command="Browser:RestoreLastSession"
 | |
| 184 | +                     hidden="true"/>
 | |
| 183 | 185 |        <toolbarseparator/>
 | 
| 184 | 186 |        <toolbarbutton id="appMenuClearRecentHistory"
 | 
| 185 | 187 |                       data-l10n-id="appmenu-clear-history"
 | 
| ... | ... | @@ -458,6 +458,7 @@ | 
| 458 | 458 |       have their strings defined by appmenu-data-l10n-id. -->
 | 
| 459 | 459 |                  <menuitem id="menu_openHelp"
 | 
| 460 | 460 |                            oncommand="openHelpLink('firefox-help')"
 | 
| 461 | +                          hidden="true"
 | |
| 461 | 462 |                            data-l10n-id="menu-get-help"
 | 
| 462 | 463 |                            appmenu-data-l10n-id="appmenu-get-help"
 | 
| 463 | 464 |  #ifdef XP_MACOSX
 | 
| ... | ... | @@ -467,14 +468,17 @@ | 
| 467 | 468 |  #endif
 | 
| 468 | 469 |                  <menuitem id="feedbackPage"
 | 
| 469 | 470 |                            oncommand="openFeedbackPage()"
 | 
| 471 | +                          hidden="true"
 | |
| 470 | 472 |                            data-l10n-id="menu-help-share-ideas"
 | 
| 471 | 473 |                            appmenu-data-l10n-id="appmenu-help-share-ideas"/>
 | 
| 472 | 474 |                  <menuitem id="helpSafeMode"
 | 
| 473 | 475 |                            oncommand="safeModeRestart();"
 | 
| 476 | +                          hidden="true"
 | |
| 474 | 477 |                            data-l10n-id="menu-help-enter-troubleshoot-mode2"
 | 
| 475 | 478 |                            appmenu-data-l10n-id="appmenu-help-enter-troubleshoot-mode2"/>
 | 
| 476 | 479 |                  <menuitem id="troubleShooting"
 | 
| 477 | 480 |                            oncommand="openTroubleshootingPage()"
 | 
| 481 | +                          hidden="true"
 | |
| 478 | 482 |                            data-l10n-id="menu-help-more-troubleshooting-info"
 | 
| 479 | 483 |                            appmenu-data-l10n-id="appmenu-help-more-troubleshooting-info"/>
 | 
| 480 | 484 |                  <menuitem id="help_reportSiteIssue"
 | 
| ... | ... | @@ -7,6 +7,10 @@ | 
| 7 | 7 | |
| 8 | 8 |  var gSafeBrowsing = {
 | 
| 9 | 9 |    setReportPhishingMenu() {
 | 
| 10 | +    // tor-browser#18905: disable these menu entries
 | |
| 11 | +    /* eslint-disable no-unreachable */
 | |
| 12 | +    return;
 | |
| 13 | + | |
| 10 | 14 |      // In order to detect whether or not we're at the phishing warning
 | 
| 11 | 15 |      // page, we have to check the documentURI instead of the currentURI.
 | 
| 12 | 16 |      // This is because when the DocShell loads an error page, the
 |