Skip to content

Commit 3dd2b8c

Browse files
author
Benjamin Pick
committed
Remove legacy test, prepare 5.6.1
1 parent 8badc0f commit 3dd2b8c

File tree

3 files changed

+7
-20
lines changed

3 files changed

+7
-20
lines changed

geoip-detect.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Description: Provides geographic information detected by an IP adress.
66
Author: Yellow Tree (Benjamin Pick)
77
Author URI: http://www.yellowtree.de
8-
Version: 5.6.0
8+
Version: 5.6.1
99
License: GPLv3 or later
1010
License URI: http://www.gnu.org/licenses/gpl-3.0.html
1111
Text Domain: geoip-detect
@@ -15,7 +15,7 @@
1515
Requires PHP: 7.2.5
1616
*/
1717

18-
define('GEOIP_DETECT_VERSION', '5.6.0');
18+
define('GEOIP_DETECT_VERSION', '5.6.1');
1919

2020
/*
2121
Copyright 2013-2023 Yellow Tree, Siegen, Germany

readme.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ See [Documentation](https://github.com/yellowtree/geoip-detect/wiki) for more in
124124

125125
== Upgrade Notice ==
126126

127-
= 5.6.0 =
127+
= 5.6.1 =
128128

129129
This update removes the deprecated shortcode [geoip_detect ...] (read the changelog for more details)
130130

@@ -138,11 +138,13 @@ If you are using AJAX mode, please read the changelog.
138138

139139
== Changelog ==
140140

141-
= 5.6.0 =
141+
= 5.6.1 =
142142
* FIX [!]: Remove deprecated shortcode [geoip_detect] (Security - CVE-2025-57993). If you are still using it, use [geoip_detect2 ...] instead, you might have to change the property name.
143143
* FIX: Compatibility with Wordpress 6.7 (Textdomain loading)
144144
* Library updates
145145

146+
(5.6.0 was not released)
147+
146148
= 5.5.0 =
147149
* FIX [!]: In the datasource "hostip.info", the region code (i.e. CA) is now correctly moved to the property `mostSpecificSubdivision` (previously, it was part of the property `city`)
148150
* Library updates

tests/test-legacy-api.php

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,6 @@ function testTimezone()
5151
function testRegionName() {
5252
$record = geoip_detect_get_info_from_ip(GEOIP_DETECT_TEST_IP);
5353
$this->assertGreaterThan(1, strlen($record->region_name), 'Region Name: "' . $record->region_name);
54-
}
55-
56-
function testShortcode() {
57-
add_filter('geoip_detect_get_external_ip_adress', [ $this, 'filter_set_test_ip' ], 101);
58-
$this->assertEquals(GEOIP_DETECT_TEST_IP, geoip_detect_get_external_ip_adress());
59-
60-
$string = do_shortcode('[geoip_detect property="country_name"]');
61-
$this->assertNotEmpty($string, '[geoip_detect property="country_name"]', "The Geolocation IP Detection shortcode did not generate any output");
62-
$this->assertNotEquals($string, '[geoip_detect property="country_name"]', "The Geolocation IP Detection shortcode does not seem to be called");
63-
$this->assertStringNotContainsString('<!--', $string, "Geolocation IP Detection shortcode threw an error: " . $string);
64-
65-
$string = do_shortcode('[geoip_detect property="INVALID"]');
66-
$this->assertStringContainsString('<!--', $string, "Geolocation IP Detection Shortcode threw no error in spite of invalid property name: " . $string);
67-
$string = do_shortcode('[geoip_detect property="INVALID" default="here"]');
68-
$this->assertStringContainsString('here', $string, "Geolocation IP Detection Shortcode does not contain default value: " . $string);
69-
}
54+
}
7055
}
7156

0 commit comments

Comments
 (0)