1 files changed, 6 insertions, 28 deletions

diff --git a/site/app/config/bootstrap.php b/site/app/config/bootstrap.php
index ce43a70..04b7200 100644
--- a/site/app/config/bootstrap.php
+++ b/site/app/config/bootstrap.php
@@ -219,18 +219,8 @@ if (array_key_exists($buf[0],$valid_languages)) {
 
 // Now make sure that there's a known app/layout in the second position.
 if (count($buf) < 2 || !array_key_exists($buf[1], $valid_layouts)) {
-    // we are sugar
-    if (true)
-        array_splice($buf, 1, 0, "sugar");
-    else
-    // No app or unknown app, so we see if this is seamonkey, otherwise stick
-    // firefox in the place of honour and redirect.
-    if (array_key_exists('HTTP_USER_AGENT', $_SERVER) && 
-        strpos($_SERVER['HTTP_USER_AGENT'], 'SeaMonkey') !== false) {
-        array_splice($buf, 1, 0, "seamonkey");
-    } else {
-        array_splice($buf, 1, 0, "firefox");
-    }
+    // No app or unknown app, so make it Sugar.
+    array_splice($buf, 1, 0, "sugar");
     redirectWithNewLocaleAndExit($buf);
 }
 
@@ -245,7 +235,7 @@ if (array_key_exists(SITE_LAYOUT, $other_layouts)) {
     }
     else {
         // App wasn't set, so default to Firefox
-        define('APP_SHORTNAME', 'firefox');
+        define('APP_SHORTNAME', 'sugar');
     }
     define('LAYOUT_NAME', $other_layouts[SITE_LAYOUT]);
 }
@@ -275,11 +265,12 @@ if (in_array(LANG, $rtl_languages)) {
 
 global $app_prettynames;
 $app_prettynames = array(
-    'sugar' => ___('main_prettyname_sugar'),
+    'firefox' => ___('main_prettyname_firefox'),
     'thunderbird' => ___('main_prettyname_thunderbird'),
     'sunbird' => ___('main_prettyname_sunbird'),
     'seamonkey' => ___('main_prettyname_seamonkey'),
-    'fennec' => ___('main_prettyname_fennec')
+    'fennec' => ___('main_prettyname_fennec'),
+    'sugar' => ___('main_prettyname_sugar')
     );
 define('APP_PRETTYNAME', $app_prettynames[APP_SHORTNAME]);
 
@@ -293,18 +284,5 @@ unset($webpath, $buf, $lang, $language_config);
 global $flush_lists;
 $flush_lists = array();
 
-/**
- * We depend on the order of these licenses, so this list is append-only.
- */
-global $licenses;
-$licenses = array(
-    ___('licenses_mpl_1.1'),
-    ___('licenses_gpl_2.0'),
-    ___('licenses_gpl_3.0'),
-    ___('licenses_lgpl_2.1'),
-    ___('licenses_lgpl_3.0'),
-    ___('licenses_mit'),
-    ___('licenses_bsd')
-);
 //EOF
 ?>