--- supernav/supernav.module	2008-03-31 23:06:39.000000000 +0100
+++ supernav.module	2008-09-03 16:59:05.000000000 +0100
@@ -64,9 +64,10 @@ unset($branding);
  * Set global shortcut keys
  */
 // Create bookmark shortcuts
+$shortcut_keys = "";
+$comma = "";
  for ($i=0; $i<8; $i++) {
-   $shortcut_keys = "
-   'b+". ($i+1) ."': function () { 
+   $shortcut_keys = "'b+". ($i+1) ."': function () { 
       destination = parent.frames['supernav_left'].$('.bookmark-item-". $i ."').attr('href');
       if (destination) {
         parent.frames['supernav_right'].location.href = destination;
@@ -1158,7 +1159,7 @@ function supernav_footer() {
   global $user;
   drupal_add_js(drupal_get_path('module', 'supernav') .  '/jquery.shortkeys.js');
   // Redirect outside of frame on logout
-  if ($_GET['supernav_logout'] && !user_access('supernav view')) {
+  if (isset($_GET['supernav_logout']) && !user_access('supernav view')) {
     $script = "
       <script>
         if (parent.frames['supernav_left']) {
@@ -1166,6 +1167,8 @@ function supernav_footer() {
         }
         </script>";
     return $script;
+  } else {
+	return $script = "";
   }
   
   if (user_access('supernav view')) {
@@ -1177,7 +1180,7 @@ function supernav_footer() {
       $new_location = "document.location = '". url('mynav') ."&right_frame=' + parent.document.location";
     }
         
-    if ($settings['no_force_frame'] != 1) {
+    if ($settings['no_force_frame'] != 1 ) {
       $script .= "
         if (top.location + window.location.search.substring(1) == document.location + window.location.search.substring(1)) {
           ". $new_location ."