Merge branch 'master' of https://github.com/opencart/opencart

devalin · Aug 13, 2012 · 4f99d4b · 4f99d4b
2 parents e5cf1a2 + 47c1c5e
commit 4f99d4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/upload/admin/controller/report/customer_online.php b/upload/admin/controller/report/customer_online.php
@@ -86,7 +86,7 @@ public function index() {
 			}
 
       		$this->data['customers'][] = array(
-				'ip'         => long2ip($result['ip']),
+				'ip'         => $result['ip'],
 				'customer'   => $customer,
 				'url'        => $result['url'],
 				'referer'    => $result['referer'],

diff --git a/upload/install/opencart.sql b/upload/install/opencart.sql
@@ -613,7 +613,7 @@ INSERT INTO `oc_country` (`country_id`, `name`, `iso_code_2`, `iso_code_3`, `add
 (78, 'Gabon', 'GA', 'GAB', '', 0, 1),
 (79, 'Gambia', 'GM', 'GMB', '', 0, 1),
 (80, 'Georgia', 'GE', 'GEO', '', 0, 1),
-(81, 'Germany', 'DE', 'DEU', '{company}\r\n{firstname} {lastname}\r\n{address_1}\r\n{address_2}\r\n{postcode} {city}\r\n{country}', 0, 1),
+(81, 'Germany', 'DE', 'DEU', '{company}\r\n{firstname} {lastname}\r\n{address_1}\r\n{address_2}\r\n{postcode} {city}\r\n{country}', 1, 1),
 (82, 'Ghana', 'GH', 'GHA', '', 0, 1),
 (83, 'Gibraltar', 'GI', 'GIB', '', 0, 1),
 (84, 'Greece', 'GR', 'GRC', '', 0, 1),
@@ -7050,6 +7050,7 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `code`, `name`, `status`) VALUES
 (3966, 190, '11', 'Goriška', 1),
 (3967, 190, '12', 'Obalno-kraška', 1),
 (3968, 33, '', 'Ruse', 1);
+(3969, 101, 'ALB', 'Alborz', 1);
 
 -- --------------------------------------------------------