Login/Logout redirect bug if get vars present

Author: craigdietrich

system/application/views/melons/cantaloupe/js/scalarheader.jquery.js

@@ -1227,10 +1227,9 @@ getPropertyValue:function(a){return this[a]||""},item:function(){},removePropert
             }else{
                 redirect_url = encodeURIComponent(window.location.href);
             }
-
             if (base.logged_in){
-                userList.append('<li><a href="' + base.get_param(addTemplateToURL( system_uri + '/dashboard?'+(base.is_author?'book_id=' + base.book_id + '&' : '')+'zone=user#tabs-user', 'cantaloupe')) + '">Account</a></li>');
-                userList.append('<li><a href="' + base.get_param(addTemplateToURL(system_uri+'/logout?action=do_logout&redirect_url='+redirect_url, 'cantaloupe')) + '">Sign out</a></li>');
+                userList.append('<li><a href="' + base.get_param(addTemplateToURL(system_uri + '/dashboard?'+(base.is_author?'book_id=' + base.book_id + '&' : '')+'zone=user#tabs-user', 'cantaloupe')) + '">Account</a></li>');
+                userList.append('<li><a href="' + base.get_param(addTemplateToURL(system_uri+'/logout?action=do_logout&redirect_url='+redirect_url + '&', 'cantaloupe')) + '">Sign out</a></li>');
             } else {
                 userList.append('<li><a href="' + base.get_param(addTemplateToURL(system_uri+'/login?redirect_url='+redirect_url, 'cantaloupe')) + '">Sign in</a></li>');
                 userList.append('<li><a href="' + base.get_param(addTemplateToURL(system_uri+'/register?redirect_url='+redirect_url, 'cantaloupe')) + '">Register</a></li>');