aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/remove.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-06-23 16:32:20 -0400
committerJoey Hess <joey@kitenet.net>2010-06-23 16:35:51 -0400
commit4292802ee5f93f7ec7644c5d0a30f7ffeb95e566 (patch)
tree603a4a6f366f411b2ef1909825d400db6ad65bc7 /IkiWiki/Plugin/remove.pm
parentb4a43406f61b7ff9ab77d242edf4d59369ac8596 (diff)
downloadikiwiki-4292802ee5f93f7ec7644c5d0a30f7ffeb95e566.tar
ikiwiki-4292802ee5f93f7ec7644c5d0a30f7ffeb95e566.tar.gz
stop using REMOTE_ADDR
Everywhere that REMOTE_ADDR was used, a session object is available, so instead use its remote_addr method. In IkiWiki::Receive, stop setting a dummy REMOTE_ADDR. Note that it's possible for a session cookie to be obtained using one IP address, and then used from another IP. In this case, the first IP will now be used. I think that should be ok.
Diffstat (limited to 'IkiWiki/Plugin/remove.pm')
-rw-r--r--IkiWiki/Plugin/remove.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index d23b2cc10..b664cbf74 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -214,7 +214,8 @@ sub sessioncgi ($$) {
IkiWiki::rcs_remove($file);
}
IkiWiki::rcs_commit_staged(gettext("removed"),
- $session->param("name"), $ENV{REMOTE_ADDR});
+ $session->param("name"),
+ $session->remote_addr());
IkiWiki::enable_commit_hook();
IkiWiki::rcs_update();
}