Changeset 2397

Show
Ignore:
Timestamp:
05/20/08 00:27:05 (21 months ago)
Author:
bchoate
Message:

Use entry_id parameter for signing out when in a preview context. BugId:79829

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/release-38/default_templates/javascript.mtml

    r2393 r2397  
    454454    doc_url = doc_url.replace(/#.+/, ''); 
    455455    var url = '<$mt:SignInLink$>'; 
    456     url += '&return_url=' + encodeURIComponent(doc_url); 
     456    if (is_preview) { 
     457        if ( document['comments_form'] ) { 
     458            var entry_id = document['comments_form'].entry_id.value; 
     459            url += '&entry_id=' + entry_id; 
     460        } else { 
     461            url += '&return_url=<$MTBlogURL encode_url="1"$>'; 
     462        } 
     463    } else { 
     464        url += '&return_url=' + encodeURIComponent(doc_url); 
     465    } 
    457466    mtClearUser(); 
    458467    location.href = url; 
     
    493502function mtSignOut(entry_id) { 
    494503    mtClearUser(); 
    495     var url = '<$mt:SignOutLink$>&return_url=' + encodeURIComponent(location.href); 
     504    var doc_url = document.URL; 
     505    doc_url = doc_url.replace(/#.+/, ''); 
     506    var url = '<$mt:SignOutLink$>'; 
     507    if (is_preview) { 
     508        if ( document['comments_form'] ) { 
     509            var entry_id = document['comments_form'].entry_id.value; 
     510            url += '&entry_id=' + entry_id; 
     511        } else { 
     512            url += '&return_url=<$MTBlogURL encode_url="1"$>'; 
     513        } 
     514    } else { 
     515        url += '&return_url=' + encodeURIComponent(doc_url); 
     516    } 
    496517    location.href = url; 
    497518}