diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-11-22 14:28:38 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-11-22 14:28:38 +0000 |
| commit | 04a9dbfe7daa9c352ae4e9af17df8134248f3806 (patch) | |
| tree | 253d6c60f0ebcdc7198ea9e67767400de711755d /IkiWiki/CGI.pm | |
| parent | 00c6f9e5cbed1ed0943d93aacdf63ce696133ca6 (diff) | |
| download | ikiwiki-04a9dbfe7daa9c352ae4e9af17df8134248f3806.tar ikiwiki-04a9dbfe7daa9c352ae4e9af17df8134248f3806.tar.gz | |
updates
Diffstat (limited to 'IkiWiki/CGI.pm')
| -rw-r--r-- | IkiWiki/CGI.pm | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index b90b43d8d..1caea99a4 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -478,20 +478,13 @@ sub cgi_editpage ($$) { #{{{ $content=~s/\r/\n/g; writefile($file, $config{srcdir}, $content); - my $message="web commit "; - if (defined $session->param("name") && - length $session->param("name")) { - $message.="by ".$session->param("name"); - } - else { - $message.="from $ENV{REMOTE_ADDR}"; - } - if (defined $form->field('comments') && - length $form->field('comments')) { - $message.=": ".$form->field('comments'); - } - if ($config{rcs}) { + my $message=""; + if (defined $form->field('comments') && + length $form->field('comments')) { + $message=$form->field('comments'); + } + if ($newfile) { rcs_add($file); } @@ -500,7 +493,8 @@ sub cgi_editpage ($$) { #{{{ # presumably the commit will trigger an update # of the wiki my $conflict=rcs_commit($file, $message, - $form->field("rcsinfo")); + $form->field("rcsinfo"), + $session->param("name"), $ENV{REMOTE_ADDR}); if (defined $conflict) { $form->field(name => "rcsinfo", value => rcs_prepedit($file), |