10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-11 18:56:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #261 from nikitasinelnikov/master

Browse Source 
Merge pull request #1 from ultimatemember/master
This commit is contained in:
Champ Camba
2017-04-11 18:29:44 +08:00
committed by GitHub
parent 330e81ced8 5c0890cdbc
commit 3b72ea6d1f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/assets/js/um-admin-ajax.js
+5 -2
View File
@@ -5,7 +5,10 @@ jQuery(document).ready(function() {
});
jQuery(document).on('click', 'a[data-silent_action^="um_"]',function(){
if ( typeof jQuery(this).attr('disabled') !== 'undefined' )
return false;
in_row = '';
in_sub_row = '';
in_column = '';
@@ -50,4 +53,4 @@ jQuery(document).ready(function() {
});
});
});
admin/core/um-admin-actions-modal.php
+3 -3
View File
@@ -138,7 +138,7 @@
case 'um_admin_show_fields':
ob_start();
$form_fields = $ultimatemember->query->get_attr( 'custom_fields', $arg2 );
?>
<h4><?php _e('Setup New Field','ultimatemember'); ?></h4>
@@ -167,7 +167,7 @@
if ( !isset( $array['account_only'] ) && !isset( $array['private_use'] ) ) {
?>
<a href="#" class="button" data-silent_action="um_admin_add_field_from_predefined" data-arg1="<?php echo $field_key; ?>" data-arg2="<?php echo $arg2; ?>"><?php echo um_trim_string( stripslashes( $array['title'] ), 20 ); ?></a>
<a href="#" class="button" <?php disabled( in_array( $field_key, array_keys( $form_fields ) ) ) ?> data-silent_action="um_admin_add_field_from_predefined" data-arg1="<?php echo $field_key; ?>" data-arg2="<?php echo $arg2; ?>"><?php echo um_trim_string( stripslashes( $array['title'] ), 20 ); ?></a>
<?php } } } else { echo '<p>' . __('None','ultimatemember') . '</p>'; } ?>
@@ -366,4 +366,4 @@
if(is_array($output)){ print_r($output); }else{ echo $output; } die;
}
}