Skip to content

Commit f303834

Browse files
committed
Validated with WordPress 6.8
1 parent 2a89e22 commit f303834

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Software License](https://img.shields.io/badge/License-GPL%20v2-green.svg?style=flat-square)](LICENSE) [![PHP 7.2\+](https://img.shields.io/badge/PHP-7.2-blue?style=flat-square)](https://php.net) [![PHP 7.4\+](https://img.shields.io/badge/PHP-7.4-blue?style=flat-square)](https://php.net) [![WordPress 5](https://img.shields.io/badge/WordPress-5.8-orange?style=flat-square)](https://wordpress.org) [![WordPress 6](https://img.shields.io/badge/WordPress-6.7-orange?style=flat-square)](https://wordpress.org)
1+
[![Software License](https://img.shields.io/badge/License-GPL%20v2-green.svg?style=flat-square)](LICENSE) [![PHP 7.2\+](https://img.shields.io/badge/PHP-7.2-blue?style=flat-square)](https://php.net) [![PHP 7.4\+](https://img.shields.io/badge/PHP-7.4-blue?style=flat-square)](https://php.net) [![WordPress 5](https://img.shields.io/badge/WordPress-5.8-orange?style=flat-square)](https://wordpress.org) [![WordPress 6](https://img.shields.io/badge/WordPress-6.8-orange?style=flat-square)](https://wordpress.org)
22

33
# EasyMap
44

@@ -54,6 +54,10 @@ This is a hard question to answer. There are no known incompatibilities.
5454

5555
## Changelog
5656

57+
### 1.1.2
58+
* Validated with WordPress 6.8
59+
* Corrected call to unknown intl() function
60+
5761
### 1.1.1
5862
* Validated with WordPress 6.7
5963
* Verified with Plugin Check (PCP)

easymap/easymap.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Plugin Name: EasyMap
1212
* Plugin URI: https://code.webbplatsen.net/wordpress/easymap/
1313
* Description: Uncomplicated map functionality for WordPress
14-
* Version: 1.1.1
14+
* Version: 1.1.2
1515
* Author: WebbPlatsen, Joaquim Homrighausen <joho@webbplatsen.se>
1616
* Author URI: https://webbplatsen.se/
1717
* License: GPL-2.0+
@@ -51,7 +51,7 @@
5151
}
5252

5353
define( 'EASYMAP_WORDPRESS_PLUGIN', true );
54-
define( 'EASYMAP_VERSION', '1.1.1' );
54+
define( 'EASYMAP_VERSION', '1.1.2' );
5555
define( 'EASYMAP_REV', 1 );
5656
define( 'EASYMAP_PLUGINNAME_SLUG', 'easymap' );
5757
define( 'EASYMAP_DEFAULT_PREFIX', 'easymap' );

easymap/include/class_location_admin.inc.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function __construct( int $icon_style, array $location_list, string $loca
8383
if ( function_exists( 'collator_create' ) ) {
8484
$this->collator = collator_create( $this->locale );
8585
if ( ! is_object( $this->collator ) ) {
86-
error_log( basename(__FILE__) . ' (' . __FUNCTION__ . '): Unable to create collator ("' . intl_error_message() . '")');
86+
error_log( basename(__FILE__) . ' (' . __FUNCTION__ . '): Unable to create collator ("' . intl_get_error_message() . '")');
8787
$this->collator = false;
8888
}
8989
} else {
@@ -168,7 +168,7 @@ public function no_items() {
168168
* @since 1.0.0
169169
* @return array $columns, array of columns in table
170170
*/
171-
public function get_columns() {
171+
public function get_columns() : array {
172172
$table_columns = array(
173173
//'cb' => '<input type="checkbox" />',
174174
'id' => __( 'ID', 'easymap' ),
@@ -185,7 +185,7 @@ public function get_columns() {
185185
* @since 1.0.0
186186
* @return array $sortable, the columns that can be sorted by.
187187
*/
188-
protected function get_sortable_columns() {
188+
protected function get_sortable_columns() : array {
189189
$sortable = array(
190190
'id' => array( 'id', true ),
191191
'al' => array( 'al', true ),
@@ -215,7 +215,7 @@ protected function column_cb( $item ){
215215
*
216216
* @since 1.0.0
217217
*/
218-
protected function retain_search_pagination() {
218+
protected function retain_search_pagination() : string {
219219
$addon_str = '';
220220
if ( ! empty( $_REQUEST['orderby'] ) ) {
221221
$addon_str .= '&orderby=' . sanitize_key( trim( $_REQUEST['orderby'] ) );
@@ -323,7 +323,7 @@ public function column_id( $item ) {
323323
*
324324
* @since 1.0.0
325325
*/
326-
public function get_bulk_actions() {
326+
public function get_bulk_actions() : array {
327327
$actions = array();
328328
// $actions['delete'] = __( 'Delete', 'easymap' );
329329
return( $actions );
@@ -404,9 +404,9 @@ public function handle_location_actions() {
404404
*
405405
* @since 1.0.0
406406
*/
407-
protected function get_locations( string $search_string ) {
407+
protected function get_locations( string $search_string ) : array {
408+
$db_results = array();
408409
if ( ! empty( $search_string ) ) {
409-
$db_results = array();
410410
$is_numeric = is_numeric( $search_string );
411411
foreach( $this->easymap_location_list as $k => $v ) {
412412
if ( empty( $v['na'] ) ) {
@@ -428,7 +428,6 @@ protected function get_locations( string $search_string ) {
428428
}
429429
}
430430
} else {
431-
$db_results = array();
432431
foreach( $this->easymap_location_list as $k => $v ) {
433432
if ( empty( $v['na'] ) ) {
434433
continue;
@@ -450,6 +449,7 @@ protected function get_locations( string $search_string ) {
450449
public function handle_sorting( $a, $b ) {
451450
$order_by = ( isset( $_REQUEST['orderby'] ) ) ? sanitize_key( $_REQUEST['orderby'] ) : 'id';
452451
$order_how = ( ! empty( $_REQUEST['order'] ) ) ? sanitize_key( $_REQUEST['order'] ) : 'asc';
452+
$result = 0;
453453

454454
switch( $order_by ) {
455455
case 'na':// Name

0 commit comments

Comments
 (0)