[Xfce4-commits] <archive:master> Use other ENV.

[Nick Schermer]

Updating branch refs/heads/master
         to 0adc42eedeb1f709a098ce11f33359a4327fedc9 (commit)
       from abae7304ae51fee6feec76331e8089df2b72bcbf (commit)

commit 0adc42eedeb1f709a098ce11f33359a4327fedc9
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Nov 12 14:58:38 2011 +0100

    Use other ENV.

 fancyindex/views/geolocation.haml |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/fancyindex/views/geolocation.haml b/fancyindex/views/geolocation.haml
index 7100ffe..f35de29 100644
--- a/fancyindex/views/geolocation.haml
+++ b/fancyindex/views/geolocation.haml
@@ -1,17 +1,19 @@
 %Response
-  - if env[:GEOIP_ADDR]
-    %Ip #{env[:GEOIP_ADDR]}
-  - if env[:GEOIP_COUNTRY_CODE]
-    %CountryCode #{env[:GEOIP_COUNTRY_CODE]}
-  - if env[:GEOIP_COUNTRY_NAME]
-    %CountryName #{env[:GEOIP_COUNTRY_NAME]}
-  - if env[:GEOIP_REGION]
-    %RegionCode #{env[:GEOIP_REGION]}
-  - if env[:GEOIP_REGION_NAME]
-    %RegionName #{env[:GEOIP_REGION_NAME]}
-  - if env[:GEOIP_CITY]
-    %City #{env[:GEOIP_CITY]}
-  - if env[:GEOIP_LATITUDE]
-    %Latitude #{env[:GEOIP_LATITUDE]}
-  - if env[:GEOIP_LONGITUDE]
-    %Longitude #{env[:GEOIP_LONGITUDE]}
+  - if ENV['GEOIP_ADDR']
+    %Ip #{ENV['GEOIP_ADDR']}
+  - if ENV['GEOIP_COUNTRY_CODE']
+    %CountryCode #{ENV['GEOIP_COUNTRY_CODE']}
+  - if ENV['GEOIP_COUNTRY_NAME']
+    %CountryName #{ENV['GEOIP_COUNTRY_NAME']}
+  - if ENV['GEOIP_REGION']
+    %RegionCode #{ENV['GEOIP_REGION']}
+  - if ENV['GEOIP_REGION_NAME']
+    %RegionName #{ENV['GEOIP_REGION_NAME']}
+  - if ENV['GEOIP_AREA_CODE']
+    %RegionName #{ENV['GEOIP_AREA_CODE']}
+  - if ENV['GEOIP_CITY']
+    %City #{ENV['GEOIP_CITY']}
+  - if ENV['GEOIP_LATITUDE']
+    %Latitude #{ENV['GEOIP_LATITUDE']}
+  - if ENV['GEOIP_LONGITUDE']
+    %Longitude #{ENV['GEOIP_LONGITUDE']}