- fixed encoding if not installed mbstring PHP library;

- some texts changes;
- some fixes on first install and forms metaboxes;
This commit is contained in:
nikitozzzzzzz
2017-08-03 10:52:40 +03:00
parent f676d1c112
commit 6c9668c0cb
12 changed files with 61 additions and 63 deletions
+3 -3
View File
@@ -292,10 +292,10 @@ if ( ! class_exists( 'Shortcodes' ) ) {
$args = array_merge($post_data, $args);
if (isset($args['use_globals']) && $args['use_globals'] == 1) {
$args = array_merge($args, $this->get_css_args($args));
if ( empty( $args['use_custom_settings'] ) ) {
$args = array_merge( $args, $this->get_css_args( $args ) );
} else {
$args = array_merge($this->get_css_args($args), $args);
$args = array_merge( $this->get_css_args( $args ), $args );
}
// filter for arguments