diff --git a/assets/dynamic_css/dynamic-directory.php b/assets/dynamic_css/dynamic-directory.php new file mode 100644 index 00000000..31f12f1c --- /dev/null +++ b/assets/dynamic_css/dynamic-directory.php @@ -0,0 +1,38 @@ + + diff --git a/assets/dynamic_css/dynamic-global.php b/assets/dynamic_css/dynamic-global.php new file mode 100644 index 00000000..641ebf62 --- /dev/null +++ b/assets/dynamic_css/dynamic-global.php @@ -0,0 +1,21 @@ + + diff --git a/assets/dynamic_css/dynamic-profile.php b/assets/dynamic_css/dynamic-profile.php new file mode 100644 index 00000000..14803fd2 --- /dev/null +++ b/assets/dynamic_css/dynamic-profile.php @@ -0,0 +1,37 @@ + + diff --git a/assets/dynamic_css/dynamic_directory.php b/assets/dynamic_css/dynamic_directory.php deleted file mode 100644 index f1105145..00000000 --- a/assets/dynamic_css/dynamic_directory.php +++ /dev/null @@ -1,45 +0,0 @@ - \ No newline at end of file diff --git a/assets/dynamic_css/dynamic_global.php b/assets/dynamic_css/dynamic_global.php deleted file mode 100644 index 2e867156..00000000 --- a/assets/dynamic_css/dynamic_global.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/assets/dynamic_css/dynamic_profile.php b/assets/dynamic_css/dynamic_profile.php deleted file mode 100644 index ae7309d2..00000000 --- a/assets/dynamic_css/dynamic_profile.php +++ /dev/null @@ -1,49 +0,0 @@ - - - \ No newline at end of file diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php index 06bd3b30..3b15dbeb 100644 --- a/includes/core/class-shortcodes.php +++ b/includes/core/class-shortcodes.php @@ -861,15 +861,20 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { * @param $args * @return array */ - function get_css_args( $args ) { + public function get_css_args( $args ) { $arr = um_styling_defaults( $args['mode'] ); - $arr = array_merge( $arr, array( 'form_id' => $args['form_id'], 'mode' => $args['mode'] ) ); + $arr = array_merge( + $arr, + array( + 'form_id' => $args['form_id'], + 'mode' => $args['mode'], + ) + ); return $arr; } - /** - * Load dynamic css + * Load dynamic CSS. * * @param array $args * @@ -877,31 +882,31 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { */ public function dynamic_css( $args = array() ) { /** - * Filters turn on for disable global dynamic CSS for fix the issue #306 + * Filters for disable global dynamic CSS. It's false by default, set it to true to disable. * * @since 2.0 * @hook um_disable_dynamic_global_css * - * @param {bool} $disable Disable global CSS. + * @param {bool} $disable Disable global CSS. * - * @return {bool} $disable Disable global CSS. + * @return {bool} Disable global CSS. * - * @example Turn on for disable global dynamic CSS. - * function my_disable_dynamic_global_css( $disable ) { - * // your code here - * return $disable; - * } - * add_filter( 'um_disable_dynamic_global_css', 'my_disable_dynamic_global_css', 10, 1 ); + * @example Turn off enqueue of global dynamic CSS. + * add_filter( 'um_disable_dynamic_global_css', '__return_true' ); */ $disable_css = apply_filters( 'um_disable_dynamic_global_css', false ); if ( $disable_css ) { return ''; } - include_once um_path . 'assets/dynamic_css/dynamic_global.php'; + if ( empty( $args['form_id'] ) ) { + return ''; + } - if ( isset( $args['mode'] ) && in_array( $args['mode'], array( 'profile', 'directory' ), true ) ) { - $file = um_path . 'assets/dynamic_css/dynamic_' . $args['mode'] . '.php'; + include_once UM_PATH . 'assets/dynamic_css/dynamic-global.php'; + + if ( array_key_exists( 'mode', $args ) && in_array( $args['mode'], array( 'profile', 'directory' ), true ) ) { + $file = UM_PATH . 'assets/dynamic_css/dynamic-' . $args['mode'] . '.php'; if ( file_exists( $file ) ) { include_once $file; @@ -911,14 +916,13 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { return ''; } - /** * Loads a template file * * @param $template * @param array $args */ - function template_load( $template, $args = array() ) { + public function template_load( $template, $args = array() ) { if ( is_array( $args ) ) { $this->set_args = $args; }