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

- optimized account page;

Browse Source 
- optimized code of shortcodes/password/account classes;
- fixed some enqueue scripts issues;
This commit is contained in:
nikitozzzzzzz
2017-08-11 14:21:42 +03:00
parent 92ab044b8a
commit af191ee149
11 changed files with 695 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-password.php
+7 -38
View File
@@ -116,7 +116,7 @@ if ( ! class_exists( 'Password' ) ) {
/***
*** @Add class based on shortcode
***/
function get_class( $mode ){
function get_class( $mode ) {
$classes = 'um-'.$mode;
@@ -160,9 +160,9 @@ if ( ! class_exists( 'Password' ) ) {
$args = wp_parse_args( $args, $defaults );
if ( empty( $args['use_custom_settings'] ) ) {
$args = array_merge( $args, $this->get_css_args( $args ) );
$args = array_merge( $args, UM()->shortcodes()->get_css_args( $args ) );
} else {
$args = array_merge( $this->get_css_args( $args ), $args );
$args = array_merge( UM()->shortcodes()->get_css_args( $args ), $args );
}
$args = apply_filters('um_reset_password_shortcode_args_filter', $args);
@@ -180,12 +180,12 @@ if ( ! class_exists( 'Password' ) ) {
do_action("um_before_form_is_loaded", $args);
do_action("um_before_{$mode}_form_is_loaded", $args);
do_action( "um_before_{$mode}_form_is_loaded", $args );
$this->template_load( $template, $args );
UM()->shortcodes()->template_load( $template, $args );
if ( !is_admin() && !defined( 'DOING_AJAX' ) ) {
$this->dynamic_css( $args );
if ( ! is_admin() && ! defined( 'DOING_AJAX' ) ) {
UM()->shortcodes()->dynamic_css( $args );
}
$output = ob_get_contents();
@@ -194,36 +194,5 @@ if ( ! class_exists( 'Password' ) ) {
}
/***
*** @Get dynamic css args
***/
function get_css_args( $args ) {
$arr = um_styling_defaults( $args['mode'] );
$arr = array_merge( $arr, array( 'form_id' => $args['form_id'], 'mode' => $args['mode'] ) );
return $arr;
}
/***
*** @Load dynamic css
***/
function dynamic_css( $args=array() ) {
extract($args);
$global = um_path . 'assets/dynamic_css/dynamic_global.php';
$file = um_path . 'assets/dynamic_css/dynamic_'.$mode.'.php';
include $global;
if ( file_exists( $file ) )
include $file;
}
/***
*** @Loads a template file
***/
function template_load( $template, $args=array() ) {
if ( is_array( $args ) ) {
UM()->shortcodes()->set_args = $args;
}
UM()->shortcodes()->load_template( $template );
}
}
}