Commit e0147508 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by morgan
Browse files

fixup! BB 18905: Hide unwanted items from help menu 

BB 41755: Show the link to about:support in the help menu.
parent 23c0b249

browser/base/content/browser-menubar.inc

+0 −1
Original line number Diff line number Diff line
@@ -481,7 +481,6 @@ 
                          appmenu-data-l10n-id="appmenu-help-enter-troubleshoot-mode2"/>

                <menuitem id="troubleShooting"

                          oncommand="openTroubleshootingPage()"

                          hidden="true"

                          data-l10n-id="menu-help-more-troubleshooting-info"

                          appmenu-data-l10n-id="appmenu-help-more-troubleshooting-info"/>

                <menuitem id="help_reportSiteIssue"

toolkit/content/aboutSupport.js

+3 −2
Original line number Diff line number Diff line
@@ -1931,13 +1931,14 @@ function populateActionBox() { 
  if (ResetProfile.resetSupported()) {

    $("reset-box").style.display = "block";

  }

  if (!Services.appinfo.inSafeMode && AppConstants.platform !== "android") {

  // tor-browser#41755: Do not show safe mode, as it would disable NoScript.

  /*if (!Services.appinfo.inSafeMode && AppConstants.platform !== "android") {

    $("safe-mode-box").style.display = "block";



    if (Services.policies && !Services.policies.isAllowed("safeMode")) {

      $("restart-in-safe-mode-button").setAttribute("disabled", "true");

    }

  }

  }*/

}



// Prompt user to restart the browser in safe mode