Show
Ignore:
Timestamp:
04/02/08 06:38:21 (20 months ago)
Author:
fumiakiy
Message:

Merged the latest checkins to release-32 branch to the current dev branch. svn merge -r1669:1708 http://code.sixapart.com/svn/movabletype/branches/release-32 .

Files:
1 modified

Legend:

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

    r1673 r1709  
    126126    } else { 
    127127<MTIfRegistrationRequired> 
    128         var phrase = '<__trans phrase="[_1]Sign in[_2] to comment on this entry." params="<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1">%%</a>">'; 
     128        var phrase = '<__trans phrase="[_1]Sign in[_2] to comment on this entry." params="<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1&return_to=' + encodeURIComponent(document.URL) + '">%%</a>">'; 
    129129<MTElse> 
    130         var phrase = '<__trans phrase="[_1]Sign in[_2] to comment on this entry, or [_3]comment anonymously[_2]." params="<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1">%%</a>%%<a href="javascript:void(0);" onclick="showAnonymousForm();">">'; 
     130        var phrase = '<__trans phrase="[_1]Sign in[_2] to comment on this entry, or [_3]comment anonymously[_2]." params="<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1&return_to=' + encodeURIComponent(document.URL) + '">%%</a>%%<a href="javascript:void(0);" onclick="showAnonymousForm();">">'; 
    131131</MTIfRegistrationRequired> 
    132132        document.write(phrase);