WordPress.org
Get WordPress

Plugin Directory

Changeset 1684154


Ignore:
Timestamp:
06/23/2017 10:09:44 AM (9 years ago)
Author:
anewholm
Message:

plugin page conflict

Location:
courier-address
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • courier-address/tags/3.1/courier-address.php

    r1684127 r1684154  
    1313if ( ! defined( 'ABSPATH' ) ) exit;
    1414
    15 define('COURIER_ADDRESS_MAX_POSTCODE_GROUPS', 20);
     15define( 'COURIER_ADDRESS', 'courier-address' );
     16define( 'COURIER_ADDRESS_TITLE', 'Courier Address' );
     17define( 'COURIER_ADDRESS_VERSION', '3.1' );
     18define( 'COURIER_ADDRESS_MINIMUM_PHP_VERSION', '4.0' );
     19define( 'COURIER_ADDRESS_MINIMUM_WP_VERSION', '4.0' );
     20
     21define( 'COURIER_ADDRESS_MAX_POSTCODE_GROUPS', 20 );
    1622
    1723/* -------------------------------------------- Options -------------------------------------------- */
    … …  
    2026
    2127function courier_address_add_admin_menu() {
    22   add_menu_page( 'Courier Address', 'Courier Address', 'manage_options', 'courier-address', 'courier_address_options_page', 'dashicons-admin-home' );
     28  add_submenu_page( 'options-general.php', COURIER_ADDRESS_TITLE, COURIER_ADDRESS_TITLE, 'manage_options', COURIER_ADDRESS, 'courier_address_options_page', 'dashicons-admin-home' );
    2329}
    2430
    2531function courier_address_settings_init() {
    26   register_setting( 'pluginPage', 'courier_address_settings' );
     32  register_setting( 'courier_address_plugin_page', 'courier_address_settings' );
    2733  add_settings_section(
    28     'courier_address_pluginPage_section',
     34    'courier_address_plugin_page_section',
    2935    '',
    3036    '',
    31     'pluginPage'
     37    'courier_address_plugin_page'
    3238  );
    3339
    … …  
    3743    'Your Google API Key',
    3844    'courier_address_API_key_render',
    39     'pluginPage',
    40     'courier_address_pluginPage_section'
     45    'courier_address_plugin_page',
     46    'courier_address_plugin_page_section'
    4147  );
    4248  add_settings_field(
    … …  
    4450    'Courier Address Bounds SouthWest',
    4551    'courier_address_bounds_southwest_render',
    46     'pluginPage',
    47     'courier_address_pluginPage_section'
     52    'courier_address_plugin_page',
     53    'courier_address_plugin_page_section'
    4854  );
    4955  add_settings_field(
    … …  
    5157    'Courier Address Bounds NorthEast',
    5258    'courier_address_bounds_northeast_render',
    53     'pluginPage',
    54     'courier_address_pluginPage_section'
     59    'courier_address_plugin_page',
     60    'courier_address_plugin_page_section'
    5561  );
    5662  add_settings_field(
    … …  
    5864    'Courier Address Bounds Strict',
    5965    'courier_address_bounds_strict_render',
    60     'pluginPage',
    61     'courier_address_pluginPage_section'
     66    'courier_address_plugin_page',
     67    'courier_address_plugin_page_section'
    6268  );
    6369  add_settings_field(
    … …  
    6571    'Courier Address Type',
    6672    'courier_address_type_render',
    67     'pluginPage',
    68     'courier_address_pluginPage_section'
     73    'courier_address_plugin_page',
     74    'courier_address_plugin_page_section'
    6975  );
    7076 
    … …  
    7480    'Result Equation',
    7581    'courier_address_equation_render',
    76     'pluginPage',
    77     'courier_address_pluginPage_section'
     82    'courier_address_plugin_page',
     83    'courier_address_plugin_page_section'
    7884  );
    7985  add_settings_field(
    … …  
    8187    'Result Explanation',
    8288    'courier_address_equation_explanation_render',
    83     'pluginPage',
    84     'courier_address_pluginPage_section'
     89    'courier_address_plugin_page',
     90    'courier_address_plugin_page_section'
    8591  );
    8692
    8793  //---------------------- PostCode charges
    8894  for ($i = 1; $i <= COURIER_ADDRESS_MAX_POSTCODE_GROUPS; $i++) {
    89     register_setting('pluginPage', "courier_address_postcode_group$i");
    90     register_setting('pluginPage', "courier_address_postcode_group_price$i");
     95    register_setting('courier_address_plugin_page', "courier_address_postcode_group$i");
     96    register_setting('courier_address_plugin_page', "courier_address_postcode_group_price$i");
    9197  }
    9298  add_settings_field(
    … …  
    94100    'PostCode charges',
    95101    'courier_address_postcode_charges_render',
    96     'pluginPage',
    97     'courier_address_pluginPage_section'
     102    'courier_address_plugin_page',
     103    'courier_address_plugin_page_section'
    98104  );
    99105}
    … …  
    113119   
    114120    <?php
    115       settings_fields( 'pluginPage' );
    116       do_settings_sections( 'pluginPage' );
     121      settings_fields( 'courier_address_plugin_page' );
     122      do_settings_sections( 'courier_address_plugin_page' );
    117123      submit_button();
    118124    ?>

  • courier-address/trunk/courier-address.php

    r1673085 r1684154  
    1313if ( ! defined( 'ABSPATH' ) ) exit;
    1414
    15 define('COURIER_ADDRESS_MAX_POSTCODE_GROUPS', 20);
     15define( 'COURIER_ADDRESS', 'courier-address' );
     16define( 'COURIER_ADDRESS_TITLE', 'Courier Address' );
     17define( 'COURIER_ADDRESS_VERSION', '3.1' );
     18define( 'COURIER_ADDRESS_MINIMUM_PHP_VERSION', '4.0' );
     19define( 'COURIER_ADDRESS_MINIMUM_WP_VERSION', '4.0' );
     20
     21define( 'COURIER_ADDRESS_MAX_POSTCODE_GROUPS', 20 );
    1622
    1723/* -------------------------------------------- Options -------------------------------------------- */
    … …  
    2026
    2127function courier_address_add_admin_menu() {
    22   add_menu_page( 'Courier Address', 'Courier Address', 'manage_options', 'courier-address', 'courier_address_options_page', 'dashicons-admin-home' );
     28  add_submenu_page( 'options-general.php', COURIER_ADDRESS_TITLE, COURIER_ADDRESS_TITLE, 'manage_options', COURIER_ADDRESS, 'courier_address_options_page', 'dashicons-admin-home' );
    2329}
    2430
    2531function courier_address_settings_init() {
    26   register_setting( 'pluginPage', 'courier_address_settings' );
     32  register_setting( 'courier_address_plugin_page', 'courier_address_settings' );
    2733  add_settings_section(
    28     'courier_address_pluginPage_section',
     34    'courier_address_plugin_page_section',
    2935    '',
    3036    '',
    31     'pluginPage'
     37    'courier_address_plugin_page'
    3238  );
    3339
    … …  
    3743    'Your Google API Key',
    3844    'courier_address_API_key_render',
    39     'pluginPage',
    40     'courier_address_pluginPage_section'
     45    'courier_address_plugin_page',
     46    'courier_address_plugin_page_section'
    4147  );
    4248  add_settings_field(
    … …  
    4450    'Courier Address Bounds SouthWest',
    4551    'courier_address_bounds_southwest_render',
    46     'pluginPage',
    47     'courier_address_pluginPage_section'
     52    'courier_address_plugin_page',
     53    'courier_address_plugin_page_section'
    4854  );
    4955  add_settings_field(
    … …  
    5157    'Courier Address Bounds NorthEast',
    5258    'courier_address_bounds_northeast_render',
    53     'pluginPage',
    54     'courier_address_pluginPage_section'
     59    'courier_address_plugin_page',
     60    'courier_address_plugin_page_section'
    5561  );
    5662  add_settings_field(
    … …  
    5864    'Courier Address Bounds Strict',
    5965    'courier_address_bounds_strict_render',
    60     'pluginPage',
    61     'courier_address_pluginPage_section'
     66    'courier_address_plugin_page',
     67    'courier_address_plugin_page_section'
    6268  );
    6369  add_settings_field(
    … …  
    6571    'Courier Address Type',
    6672    'courier_address_type_render',
    67     'pluginPage',
    68     'courier_address_pluginPage_section'
     73    'courier_address_plugin_page',
     74    'courier_address_plugin_page_section'
    6975  );
    7076 
    … …  
    7480    'Result Equation',
    7581    'courier_address_equation_render',
    76     'pluginPage',
    77     'courier_address_pluginPage_section'
     82    'courier_address_plugin_page',
     83    'courier_address_plugin_page_section'
    7884  );
    7985  add_settings_field(
    … …  
    8187    'Result Explanation',
    8288    'courier_address_equation_explanation_render',
    83     'pluginPage',
    84     'courier_address_pluginPage_section'
     89    'courier_address_plugin_page',
     90    'courier_address_plugin_page_section'
    8591  );
    8692
    8793  //---------------------- PostCode charges
    8894  for ($i = 1; $i <= COURIER_ADDRESS_MAX_POSTCODE_GROUPS; $i++) {
    89     register_setting('pluginPage', "courier_address_postcode_group$i");
    90     register_setting('pluginPage', "courier_address_postcode_group_price$i");
     95    register_setting('courier_address_plugin_page', "courier_address_postcode_group$i");
     96    register_setting('courier_address_plugin_page', "courier_address_postcode_group_price$i");
    9197  }
    9298  add_settings_field(
    … …  
    94100    'PostCode charges',
    95101    'courier_address_postcode_charges_render',
    96     'pluginPage',
    97     'courier_address_pluginPage_section'
     102    'courier_address_plugin_page',
     103    'courier_address_plugin_page_section'
    98104  );
    99105}
    … …  
    113119   
    114120    <?php
    115       settings_fields( 'pluginPage' );
    116       do_settings_sections( 'pluginPage' );
     121      settings_fields( 'courier_address_plugin_page' );
     122      do_settings_sections( 'courier_address_plugin_page' );
    117123      submit_button();
    118124    ?>
Note: See TracChangeset for help on using the changeset viewer.