Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits:

2 changed files:

Changes:

  • browser/base/content/browser-menubar.inc
    ... ... @@ -461,17 +461,11 @@
    461 461
                   <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
    
    462 462
     <!-- Note: Items under here are cloned to the AppMenu Help submenu. The cloned items
    
    463 463
          have their strings defined by appmenu-data-l10n-id. -->
    
    464
    -                <!-- dummy elements to avoid 'getElementById' errors -->
    
    465
    -                <box id="feedbackPage"/>
    
    466
    -                <box id="helpSafeMode"/>
    
    467
    -                <box id="menu_HelpPopup_reportPhishingtoolmenu"/>
    
    468
    -                <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/>
    
    469 464
                     <!-- Add Tor Browser manual link -->
    
    470 465
                     <menuitem id="torBrowserUserManual"
    
    471 466
                               oncommand="gBrowser.selectedTab = gBrowser.addTab('about:manual', {triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()});"
    
    472 467
                               label="&aboutTor.torbrowser_user_manual.label;"
    
    473 468
                               accesskey="&aboutTor.torbrowser_user_manual.accesskey;"/>
    
    474
    -                <!-- Bug 18905: Hide unused help menu items -->
    
    475 469
                     <menuitem id="menu_openHelp"
    
    476 470
                               oncommand="openHelpLink('firefox-help')"
    
    477 471
                               hidden="true"
    
    ... ... @@ -485,8 +479,8 @@
    485 479
                     <menuitem id="feedbackPage"
    
    486 480
                               oncommand="openFeedbackPage()"
    
    487 481
                               hidden="true"
    
    488
    -                          data-l10n-id="menu-help-feedback-page"
    
    489
    -                          appmenu-data-l10n-id="appmenu-help-feedback-page"/>
    
    482
    +                          data-l10n-id="menu-help-share-ideas"
    
    483
    +                          appmenu-data-l10n-id="appmenu-help-share-ideas"/>
    
    490 484
                     <menuitem id="helpSafeMode"
    
    491 485
                               oncommand="safeModeRestart();"
    
    492 486
                               hidden="true"
    

  • browser/base/content/browser-safebrowsing.js
    ... ... @@ -7,6 +7,13 @@
    7 7
     
    
    8 8
     var gSafeBrowsing = {
    
    9 9
       setReportPhishingMenu() {
    
    10
    +    // tor-browser#18905: hide these menu entries
    
    11
    +    if (
    
    12
    +      !Services.prefs.getBoolPref("browser.safebrowsing.phishing.enabled", true)
    
    13
    +    ) {
    
    14
    +      return;
    
    15
    +    }
    
    16
    +
    
    10 17
         // In order to detect whether or not we're at the phishing warning
    
    11 18
         // page, we have to check the documentURI instead of the currentURI.
    
    12 19
         // This is because when the DocShell loads an error page, the