Commit 1bee83e8 authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Compatibility fixes

parent 5ec49cc1

sources/fields.php

+3 −0
Original line number Diff line number Diff line
@@ -944,6 +944,8 @@ abstract class ListFieldHook 
                }

                break;



            // Not supported anymore; there are specific fields for these

            /*

            case 'REGION':

                require_code('locations');

                $continents_and_countries = find_continents_and_countries();
@@ -965,6 +967,7 @@ abstract class ListFieldHook 
                global $USA_STATE_LIST;

                $list = $USA_STATE_LIST;

                break;

            */



            default:

                if ((addon_installed('nested_cpf_spreadsheet_lists')) && (cms_strtolower_ascii(substr($default, -4)) == '.spreadsheet')) {

sources/hooks/systems/block_ui_renderers/banners.php

+1 −13
Original line number Diff line number Diff line
@@ -73,19 +73,7 @@ class Hook_block_ui_renderers_banners 


        if (($parameter == 'region') && (in_array($block, ['main_banner_wave']))) { // region list

            require_code('locations');

            $continents_and_countries = find_continents_and_countries();



            $list_groups = new Tempcode();

            $list_groups->attach(form_input_list_entry('', false));

            foreach ($continents_and_countries as $continent => $countries) {

                $list = new Tempcode();

                foreach ($countries as $country_code => $country_name) {

                    $list->attach(form_input_list_entry($country_code, $country_code == $default, $country_name));

                }

                $list_groups->attach(form_input_list_group($continent, $list));

            }



            return form_input_list(titleify($parameter), escape_html($description), $parameter, $list_groups, null, false, false);

            return form_input_region(titleify($parameter), escape_html($description), $parameter, $default);

        }



        return null;

sources/locations.php

+0 −32
Original line number Diff line number Diff line
@@ -31,27 +31,6 @@ function init__locations() 
    $ISO_CODES = new \Sokil\IsoCodes\IsoCodesFactory();

}



/**

 * TODO: Find structure of continents and countries.

 *

 * @return object

 */

function find_continents_and_countries() : object

{

    global $ISO_CODES;

    return $ISO_CODES->getCountries();

}



/**

 * TODO: Find list of continents.

 *

 * @return array List of continents

 */

function find_continents() : array

{

    return []; // TODO

}



/**

 * Find list of countries.

 *
@@ -75,17 +54,6 @@ function find_regions_by_country(string $iso) : array 
    return $ISO_CODES->getSubdivisions()->getAllByCountryCode($iso);

}



/**

 * TODO: Find continent of a country.

 *

 * @param  string $country ISO country code

 * @return ?string Continent (null: not found)

 */

function find_continent(string $country) : ?string

{

    return null; // TODO

}



/**

 * Find the ISO country code from a country name.

 *

sources_custom/locations_catalogues_install.php

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ function init__locations_catalogues_install() 


function install_location_data()

{

    // TODO: #6162

    warn_exit('Currently, location catalogues are disabled as the new locations library broke compatibility with this addon. See tracker issue 6162.');



    require_code('files');

    require_code('locations');

    require_code('files_spreadsheets_read');