deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

IPv6-compatible fix for latest Philip Taylor Phun

Browse source 
This is better than Revision 228.
This commit is contained in:
Jacques Distler 2008-03-14 17:25:02 -05:00
parent d46798dd08
commit 35257b5fae
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/wiki_controller.rb
View file

@ -3,6 +3,7 @@ require 'maruku'
require 'parsedate' require 'parsedate'
require 'zip/zip' require 'zip/zip'
require 'sanitize' require 'sanitize'
require 'resolv'
class WikiController < ApplicationController class WikiController < ApplicationController
@ -412,7 +413,7 @@ class WikiController < ApplicationController
def remote_ip def remote_ip
ip = request.remote_ip ip = request.remote_ip
logger.info(ip) logger.info(ip)
ip.gsub!(/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/, '\1') ip.gsub!(Regexp.union(Resolv::IPv4::Regex, Resolv::IPv6::Regex), '\0') || 'bogus address'
end end
def render_atom(hide_description = false, limit = 15) def render_atom(hide_description = false, limit = 15)