From 487e12ecc7a176be06778d2db870f57eeb02011d Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Thu, 13 Jan 2000 04:30:20 +0000 Subject: [PATCH] changes needed to get -installer and -ProfileManager working in the new ben goodger world. git-svn-id: svn://10.0.0.236/trunk@57630 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/profile/resources/content/profileSelection.js | 2 +- mozilla/profile/src/nsProfile.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/profile/resources/content/profileSelection.js b/mozilla/profile/resources/content/profileSelection.js index e256848f961..033fdcce174 100644 --- a/mozilla/profile/resources/content/profileSelection.js +++ b/mozilla/profile/resources/content/profileSelection.js @@ -35,7 +35,7 @@ function StartUp() { SetUpOKCancelButtons(); centerWindowOnScreen(); - if( window.location.search == "?manage=true" ) + if(window.location && window.location.search && window.location.search == "?manage=true" ) SwitchProfileManagerMode(); // bundle = srGetStrBundle("chrome://profile/locale/profileSelection.properties"); loadElements(); diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp index 1c697015bae..079799d8096 100644 --- a/mozilla/profile/src/nsProfile.cpp +++ b/mozilla/profile/src/nsProfile.cpp @@ -82,7 +82,7 @@ #define PROFILE_SELECTION_URL "chrome://profile/content/profileSelection.xul" #define PROFILE_SELECTION_CMD_LINE_ARG "-SelectProfile" -#define PROFILE_MANAGER_URL "chrome://profile/content/profileManager.xul" +#define PROFILE_MANAGER_URL "chrome://profile/content/profileSelection.xul?manage=true" #define PROFILE_MANAGER_CMD_LINE_ARG "-ProfileManager" #define PROFILE_WIZARD_URL "chrome://profile/content/createProfileWizard.xul" #define CONFIRM_AUTOMIGRATE_URL "chrome://profile/content/confirmMigration.xul"