Merge commit '21fe996544f43ad5cfcdf36388015971b7fc56d1' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:52:23 +0000 (00:52 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:52:23 +0000 (00:52 -0500)
Conflicts:
templates/page.tmpl

1  2 
IkiWiki/Plugin/git.pm
IkiWiki/Plugin/parentlinks.pm
IkiWiki/Wrapper.pm
templates/page.tmpl

index b5794a7cbdf4138c70f59128ee7555e905698949,cb3437e1861a5a7b7786fabc6011e5c8772346e7..1501460ad3445d3613bcfec7a7d1552c008da2f9
@@@ -506,14 -513,15 +514,16 @@@ sub rcs_commit_staged (@) 
                }
                if (defined $u) {
                        $u=encode_utf8($u);
 -                      $ENV{GIT_AUTHOR_NAME}=$u;
 +                      # MITLOGIN This algorithm could be improved
 +                      $ENV{GIT_AUTHOR_NAME}=IkiWiki::userinfo_get($u, "realname");
                }
-               if (defined $params{session}->param("username")) {
-                       $u=encode_utf8($params{session}->param("username"));
+               if (defined $params{session}->param("nickname")) {
+                       $u=encode_utf8($params{session}->param("nickname"));
+                       $u=~s/\s+/_/g;
+                       $u=~s/[^-_0-9[:alnum:]]+//g;
                }
                if (defined $u) {
 -                      $ENV{GIT_AUTHOR_EMAIL}="$u\@web";
 +                      $ENV{GIT_AUTHOR_EMAIL}="$u\@mit.edu";
                }
        }
  
Simple merge
Simple merge
index f8649cf8f3beafcd93392a304d7f7a745cfa6ca8,8659018a05fef3d2915287e66dcf23b6140b65aa..be2cd4ca5f96b4fff71510eb5b626d2e9d9223af
  </TMPL_IF>
  </TMPL_IF>
  <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
- <meta http-equiv="Cache-Control" content="must-revalidate" />
  <title><TMPL_VAR TITLE></title>
 -<TMPL_IF FAVICON>
 -<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 -</TMPL_IF>
 -<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
 -<TMPL_IF LOCAL_CSS>
 -<link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
 -<TMPL_ELSE>
 -<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
 -</TMPL_IF>
 +<meta http-equiv="Content-Style-Type" content="text/css" />
 +<meta name="robots" content="all" />
 +<meta name="author" content="SIPB" />
 +<meta name="description" content="MIT Student Information Processing Board" />        
 +<meta name="keywords" content="SIPB, MIT, hackers" />
 +<link rel="stylesheet" type="text/css" href="<TMPL_VAR BASEURL>style.css" />
  <TMPL_IF EDITURL>
  <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
  </TMPL_IF>