| @@ -79,11 +79,10 @@ | ||
| 79 | 79 | * @return array An array of Capabilities. |
| 80 | 80 | */ |
| 81 | 81 | public static function user_capabilities($capabilities, $caps_map, $args) |
| 82 | 82 | { |
| 83 | - foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v; | |
| 84 | - do_action('ws_plugin__s2member_before_user_capabilities', get_defined_vars()); | |
| 85 | - unset($__refs, $__v); | |
| 83 | + $_hook = 'ws_plugin__s2member_before_user_capabilities'; if (isset($GLOBALS['wp_filter'][$_hook]) || isset($GLOBALS['wp_filter']['all'])) | |
| 84 | + { foreach(array_keys(get_defined_vars()) as $__v) $__refs[$__v] =& $$__v; do_action($_hook, get_defined_vars()); } unset($_hook, $__refs, $__v); //260901 Vars by reference. | |
| 86 | 85 | |
| 87 | 86 | if(!empty($capabilities['access_s2member_ccap_all_ccaps']) && !empty($args[0]) && preg_match('/^access_s2member_ccap_/i', $args[0]) && apply_filters('ws_plugin__s2member_all_ccaps_enable', TRUE, get_defined_vars())) |
| 88 | 87 | $capabilities = array_merge((array)$capabilities, array($args[0] => 1)); |
| 89 | 88 | |
| @@ -93,9 +92,11 @@ | ||
| 93 | 92 | else if(is_multisite() && c_ws_plugin__s2member_utils_conds::is_multisite_farm() && (is_super_admin() || !empty($capabilities['administrator'])) && !empty($args[0]) && ($args[0] === 'edit_user' || $args[0] === 'edit_users')) |
| 94 | 93 | if($args[0] === 'edit_users' || ($args[0] === 'edit_user' && !empty($args[2]) && ((!empty($args[1]) && (int)$args[1] === (int)$args[2]) || is_user_member_of_blog($args[2])))) |
| 95 | 94 | $capabilities = array_merge((array)$capabilities, array('edit_users' => 1)); |
| 96 | 95 | |
| 97 | - return apply_filters('ws_plugin__s2member_user_capabilities', $capabilities, get_defined_vars()); | |
| 96 | + $_hook = 'ws_plugin__s2member_user_capabilities'; if (isset($GLOBALS['wp_filter'][$_hook]) || isset($GLOBALS['wp_filter']['all'])) | |
| 97 | + $capabilities = apply_filters($_hook, $capabilities, get_defined_vars()); unset($_hook); //260901 Defined vars. | |
| 98 | + return $capabilities; | |
| 98 | 99 | } |
| 99 | 100 | |
| 100 | 101 | /** |
| 101 | 102 | * Alters this Filter inside `/wp-admin/user-edit.php`. |
| @@ -170,10 +171,10 @@ | ||
| 170 | 171 | * @return integer Password minimum length. |
| 171 | 172 | */ |
| 172 | 173 | public static function min_password_length() |
| 173 | 174 | { |
| 174 | - $min = (integer)$GLOBALS['WS_PLUGIN__']['s2member']['o']['custom_reg_password_min_length']; | |
| 175 | - return max(6, (integer)apply_filters('ws_plugin__s2member_min_password_length', $min > 0 ? $min : 0)); | |
| 175 | + $min = (int)$GLOBALS['WS_PLUGIN__']['s2member']['o']['custom_reg_password_min_length']; | |
| 176 | + return max(6, (int)apply_filters('ws_plugin__s2member_min_password_length', $min > 0 ? $min : 0)); | |
| 176 | 177 | } |
| 177 | 178 | |
| 178 | 179 | /** |
| 179 | 180 | * Acquires minimum password strength code. |
