| @@ -373,11 +373,11 @@ | ||
| 373 | 373 | wp_enqueue_script('thickbox'); |
| 374 | 374 | wp_enqueue_script('media-upload'); |
| 375 | 375 | wp_enqueue_script('jquery-ui-core'); |
| 376 | 376 | wp_enqueue_script('jquery-sprintf', $GLOBALS['WS_PLUGIN__']['s2member']['c']['dir_url'].'/src/includes/jquery/jquery.sprintf/jquery.sprintf.min.js', array('jquery'), c_ws_plugin__s2member_utilities::ver_checksum()); |
| 377 | - wp_enqueue_script('jquery-json-ps', $GLOBALS['WS_PLUGIN__']['s2member']['c']['dir_url'].'/src/includes/jquery/jquery.json-ps/jquery.json-ps.min.js', array('jquery'), c_ws_plugin__s2member_utilities::ver_checksum()); | |
| 378 | 377 | wp_enqueue_script('jquery-ui-effects', $GLOBALS['WS_PLUGIN__']['s2member']['c']['dir_url'].'/src/includes/jquery/jquery.ui-effects/jquery.ui-effects.min.js', array('jquery', 'jquery-ui-core'), c_ws_plugin__s2member_utilities::ver_checksum()); |
| 379 | - wp_enqueue_script('ws-plugin--s2member-menu-pages', admin_url('admin.php?ws_plugin__s2member_menu_pages_js='.urlencode(mt_rand()), is_ssl() ? 'https' : 'http'), array('jquery', 'thickbox', 'media-upload', 'jquery-sprintf', 'jquery-json-ps', 'jquery-ui-core', 'jquery-ui-effects', 'password-strength-meter'), c_ws_plugin__s2member_utilities::ver_checksum()); | |
| 378 | + //260928.0402 Use WordPress's registered JSON2 compatibility script instead of shipping a duplicate JSON parser. | |
| 379 | + wp_enqueue_script('ws-plugin--s2member-menu-pages', admin_url('admin.php?ws_plugin__s2member_menu_pages_js='.urlencode(mt_rand()), is_ssl() ? 'https' : 'http'), array('jquery', 'thickbox', 'media-upload', 'jquery-sprintf', 'json2', 'jquery-ui-core', 'jquery-ui-effects', 'password-strength-meter'), c_ws_plugin__s2member_utilities::ver_checksum()); | |
| 380 | 380 | |
| 381 | 381 | do_action('ws_plugin__s2member_during_add_admin_scripts', get_defined_vars()); |
| 382 | 382 | } |
| 383 | 383 | do_action('ws_plugin__s2member_after_add_admin_scripts', get_defined_vars()); |
| @@ -549,9 +549,10 @@ | ||
| 549 | 549 | $error = TRUE; |
| 550 | 550 | } |
| 551 | 551 | if(!empty($error)) |
| 552 | 552 | c_ws_plugin__s2member_admin_notices::display_admin_notice('Unknown error when attempting to archive log files. Please check directory permissions.', TRUE); |
| 553 | - else c_ws_plugin__s2member_admin_notices::display_admin_notice('All log files have been archived succesfully.'); | |
| 553 | + else | |
| 554 | + c_ws_plugin__s2member_admin_notices::display_admin_notice('All log files have been archived successfully.'); | |
| 554 | 555 | } |
| 555 | 556 | } |
| 556 | 557 | |
| 557 | 558 | /** |
| @@ -576,9 +577,10 @@ | ||
| 576 | 577 | if(!unlink($log_dir_file)) $error = TRUE; |
| 577 | 578 | } |
| 578 | 579 | if(!empty($error)) |
| 579 | 580 | c_ws_plugin__s2member_admin_notices::display_admin_notice('Unknown error when attempting to delete log files. Please check directory permissions.', TRUE); |
| 580 | - else c_ws_plugin__s2member_admin_notices::display_admin_notice('All log files have been deleted succesfully.'); | |
| 581 | + else | |
| 582 | + c_ws_plugin__s2member_admin_notices::display_admin_notice('All log files have been deleted successfully.'); | |
| 581 | 583 | } |
| 582 | 584 | } |
| 583 | 585 | |
| 584 | 586 | /** |
