Changeset 2797458

Timestamp:

10/11/2022 11:27:02 PM (3 years ago)

Author:

Beee

Message:

fixes 1.9.0

Location:

acf-city-selector/trunk

Files:

• ACF_City_Selector.php (modified) (2 diffs)
• inc/acfcs-actions.php (modified) (1 diff)
• inc/acfcs-functions.php (modified) (8 diffs)
• readme.txt (modified) (1 diff)

acf-city-selector/trunk/ACF_City_Selector.php

@@ -4 +4 @@
     Plugin URI:     https://acf-city-selector.com
     Description:    An extension for ACF which allows you to select a city based on country and province/state.
-    Version:        1.8.0
+    Version:        1.9.0
     Tested up to:   6.0.2
     Requires PHP:   7.0
@@ -36 +36 @@
                     'db_version' => '1.0',
                     'url'        => plugin_dir_url( __FILE__ ),
-                    'version'    => get_plugin_data( __FILE__ )['Version'],
+                    'version'    => '1.9.0',
                 );
 

acf-city-selector/trunk/inc/acfcs-actions.php

@@ -15 +15 @@
                 foreach( $countries as $country_code => $label ) {
                     do_action( 'acfcs_delete_transients', $country_code );
+                    // @TODO: also add states
                 }
             }

acf-city-selector/trunk/inc/acfcs-functions.php

@@ -30 +30 @@
 
         global $wpdb;
-        $results = $wpdb->get_results( '
-                SELECT * FROM ' . $wpdb->prefix . 'cities
-                GROUP BY country
-                ORDER BY country ASC
-            ' );
+        $results = $wpdb->get_results( "
+            SELECT * FROM {$wpdb->prefix}cities
+            GROUP BY country
+            ORDER BY country ASC
+        " );
 
         if ( ! empty( $results ) ) {
@@ -84 +84 @@
                 $sql = $wpdb->prepare( "
                     SELECT *
-                    FROM " . $wpdb->prefix . "cities
+                    FROM {$wpdb->prefix}cities
                     WHERE country_code = %s
                     GROUP BY state_code
@@ -93 +93 @@
                 $state_results = array();
                 foreach ( $results as $data ) {
-                    $state_results[ $country_code . '-' . $data->state_code ] = esc_attr__( $data->state_name, 'acf-city-selector' );
+                    $state_results[ strtoupper( $country_code ) . '-' . $data->state_code ] = esc_attr__( $data->state_name, 'acf-city-selector' );
                 }
 
@@ -151 +151 @@
             if ( false !== $country_code ) {
                 global $wpdb;
-                $query = 'SELECT * FROM ' . $wpdb->prefix . 'cities';
+                $query = "SELECT * FROM {$wpdb->prefix}cities";
                 if ( $country_code && $state_code ) {
                     if ( 3 < strlen( $state_code ) ) {
                         $state_code = substr( $state_code, 3 );
                     }
-                    $query .= " WHERE country_code = '{$country_code}' AND state_code = '{$state_code}'";
-                    $query .= " ORDER BY state_name, city_name ASC";
+                    $query = $wpdb->prepare( $query . " WHERE country_code = %s AND state_code = %s ORDER BY state_name, city_name ASC", $country_code, $state_code );
                 } elseif ( $country_code ) {
-                    $query .= " WHERE country_code = '{$country_code}'";
+                    $query = $wpdb->prepare( $query . " WHERE country_code = %s", $country_code );
                 }
                 $city_results = array();
@@ -224 +223 @@
     function acfcs_has_cities( $country_code = false ) {
         global $wpdb;
-        $query = 'SELECT * FROM ' . $wpdb->prefix . 'cities LIMIT 1';
+        $query = "SELECT * FROM {$wpdb->prefix}cities LIMIT 1";
         if ( $country_code ) {
-            $query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'cities WHERE country_code = %s LIMIT 1', $country_code );
+            $query = $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}cities WHERE country_code = %s LIMIT 1", $country_code );
         }
 
@@ -440 +439 @@
     function acfcs_get_countries_info() {
         global $wpdb;
-        $results = $wpdb->get_results( '
-                SELECT country_code FROM ' . $wpdb->prefix . 'cities
+        $results = $wpdb->get_results( "
+                SELECT country_code FROM {$wpdb->prefix}cities
                 GROUP BY country_code
                 ORDER BY country_code ASC
-            ' );
+            " );
 
         $acfcs_info = array();
         foreach ( $results as $data ) {
             $country_code = $data->country_code;
-            $results      = $wpdb->get_results( $wpdb->prepare( '
-                SELECT * FROM ' . $wpdb->prefix . 'cities
+            $results      = $wpdb->get_results( $wpdb->prepare( "
+                SELECT * FROM {$wpdb->prefix}cities
                 WHERE country_code = %s
                 ORDER BY country_code ASC
-            ', $country_code ) );
+            ", $country_code ) );
 
             $acfcs_info[ $country_code ] = [
@@ -828 +827 @@
                     $order = 'ORDER BY state_name ASC';
                     if ( 'FR' == $country[ 'code' ] ) {
-                        $order = "ORDER BY LENGTH(state_name), state_name";
-                    }
-
-                    $query   = "SELECT * FROM " . $wpdb->prefix . "cities WHERE country_code = %s GROUP BY state_code " . $order;
+                        $order = 'ORDER BY LENGTH(state_name), state_name';
+                    }
+
+                    $query   = "SELECT * FROM {$wpdb->prefix}cities WHERE country_code = %s GROUP BY state_code " . $order;
                     $sql     = $wpdb->prepare( $query, $country[ 'code' ] );
                     $results = $wpdb->get_results( $sql );
@@ -906 +905 @@
         }
 
-        $sql = "SELECT * FROM " . $wpdb->prefix . "cities
+        $sql = "SELECT * FROM {$wpdb->prefix}cities
                 " . $where . "
                 " . $orderby . "

acf-city-selector/trunk/readme.txt

@@ -40 +40 @@
 A. Please read the FAQ @ [https://acf-city-selector.com/documentation/](https://acf-city-selector.com/documentation/)
 
-== Upgrade Notice ==
+== Changelog ==
 
-= 1.8.0 =
-The preview option was broken, which is now fixed. Also all 'broken' special characters are replaced.
-
-== Changelog ==
+= 1.9.0 =
+* fixed case for country code in states transient
+* added wpdb->prepare (where needed)
+* reverted version by function due to some people reporting errors
 
 = 1.8.0 =