From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 14 Apr 2015 13:16:28 +0000 (+0200)
Subject: merge
X-Git-Tag: myslice-1.3~37^2~17
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3e1430f1419315212e9a8622926fb710756cbbc9;hp=6d5518acae37a91bc4eaec999fc8b5634cbdacd7;p=myslice.git

merge
---

diff --git a/activity/__init__.py b/activity/__init__.py
index 62fbc9e8..b7496724 100644
--- a/activity/__init__.py
+++ b/activity/__init__.py
@@ -84,10 +84,10 @@ def log(request, action, message, objects = None):
     t.start()
 
 def getClientIp(request):
-    x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
-    if x_forwarded_for:
+    try :
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
         ip = x_forwarded_for.split(',')[0]
-    else:
+    except:
         ip = request.META.get('REMOTE_ADDR')
     return ip