From bcb47a1d331253d8fba47db5468ba004d2584d6b Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 19 Feb 2014 00:01:40 +0100
Subject: geoip: compatibility fix; this allows to have both versions of geoip
 loaded

---
 post.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'post.php')

diff --git a/post.php b/post.php
index 0bfd0327..99b1110b 100644
--- a/post.php
+++ b/post.php
@@ -448,7 +448,7 @@ if (isset($_POST['delete'])) {
 	
 	if ($config['country_flags']) {
 		require 'inc/lib/geoip/geoip.inc';
-		$gi=geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD);
+		$gi=geoip\geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD);
 	
 		function ipv4to6($ip) {
 			if (strpos($ip, ':') !== false) {
@@ -462,10 +462,10 @@ if (isset($_POST['delete'])) {
 			return '::ffff:'.$part7.':'.$part8;
 		}
 	
-		if ($country_code = geoip_country_code_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))) {
+		if ($country_code = geoip\geoip_country_code_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))) {
 			if (!in_array(strtolower($country_code), array('eu', 'ap', 'o1', 'a1', 'a2')))
 				$post['body'] .= "\n<tinyboard flag>".strtolower($country_code)."</tinyboard>".
-				"\n<tinyboard flag alt>".geoip_country_name_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))."</tinyboard>";
+				"\n<tinyboard flag alt>".geoip\geoip_country_name_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))."</tinyboard>";
 		}
 	}
 	
-- 
cgit v1.3