From a86f5da07095d1504e3f98901836a86bcc68e05d Mon Sep 17 00:00:00 2001 From: ultimatemember Date: Sun, 8 Feb 2015 17:27:04 +0200 Subject: [PATCH] Version 1.0.46 --- admin/assets/js/um-admin-modal.js | 13 +++++++++++++ admin/assets/js/um-admin-scripts.js | 13 ------------- admin/core/um-admin-enqueue.php | 28 +++++++++++----------------- core/um-rewrite.php | 4 +++- core/um-setup.php | 3 ++- index.php | 2 +- readme.txt | 12 +++++++++++- um-init.php | 3 ++- 8 files changed, 43 insertions(+), 35 deletions(-) diff --git a/admin/assets/js/um-admin-modal.js b/admin/assets/js/um-admin-modal.js index 46a377fa..c43029d8 100644 --- a/admin/assets/js/um-admin-modal.js +++ b/admin/assets/js/um-admin-modal.js @@ -1,3 +1,16 @@ +function um_admin_live_update_scripts() { + + jQuery('.um-admin-modal-body:visible select').select2({ + allowClear: false, + minimumResultsForSearch: 10 + }); + + jQuery('.um-adm-conditional').each(function(){jQuery(this).trigger('change');}); + + jQuery('.um-admin-colorpicker').wpColorPicker(); + +} + function um_admin_new_modal( id, ajax, size ){ var modal = jQuery('body').find('.um-admin-overlay'); diff --git a/admin/assets/js/um-admin-scripts.js b/admin/assets/js/um-admin-scripts.js index 5737d3ec..f2346c5a 100644 --- a/admin/assets/js/um-admin-scripts.js +++ b/admin/assets/js/um-admin-scripts.js @@ -1,16 +1,3 @@ -function um_admin_live_update_scripts() { - - jQuery('.um-admin-modal-body:visible select').select2({ - allowClear: false, - minimumResultsForSearch: 10 - }); - - jQuery('.um-adm-conditional').each(function(){jQuery(this).trigger('change');}); - - jQuery('.um-admin-colorpicker').wpColorPicker(); - -} - jQuery(document).ready(function() { /** diff --git a/admin/core/um-admin-enqueue.php b/admin/core/um-admin-enqueue.php index b08d8130..0e8b7174 100644 --- a/admin/core/um-admin-enqueue.php +++ b/admin/core/um-admin-enqueue.php @@ -82,7 +82,7 @@ class UM_Admin_Enqueue { wp_register_style('um_admin_form', um_url . 'admin/assets/css/um-admin-form.css' ); wp_enqueue_style('um_admin_form'); - wp_register_script('um_admin_form', um_url . 'admin/assets/js/um-admin-form.js' ); + wp_register_script('um_admin_form', um_url . 'admin/assets/js/um-admin-form.js', '', '', true ); wp_enqueue_script('um_admin_form'); } @@ -95,7 +95,7 @@ class UM_Admin_Enqueue { wp_register_style('um_admin_dashboard', um_url . 'admin/assets/css/um-admin-dashboard.css' ); wp_enqueue_style('um_admin_dashboard'); - wp_register_script('um_admin_dashboard', um_url . 'admin/assets/js/um-admin-dashboard.js' ); + wp_register_script('um_admin_dashboard', um_url . 'admin/assets/js/um-admin-dashboard.js', '', '', true ); wp_enqueue_script('um_admin_dashboard'); } @@ -108,7 +108,7 @@ class UM_Admin_Enqueue { wp_register_style('um_admin_modal', um_url . 'admin/assets/css/um-admin-modal.css' ); wp_enqueue_style('um_admin_modal'); - wp_register_script('um_admin_modal', um_url . 'admin/assets/js/um-admin-modal.js' ); + wp_register_script('um_admin_modal', um_url . 'admin/assets/js/um-admin-modal.js', '', '', true ); wp_enqueue_script('um_admin_modal'); } @@ -118,7 +118,7 @@ class UM_Admin_Enqueue { ***/ function load_field(){ - wp_register_script('um_admin_field', um_url . 'admin/assets/js/um-admin-field.js' ); + wp_register_script('um_admin_field', um_url . 'admin/assets/js/um-admin-field.js', '', '', true ); wp_enqueue_script('um_admin_field'); } @@ -128,7 +128,7 @@ class UM_Admin_Enqueue { ***/ function load_users_js(){ - wp_register_script('um_admin_users', um_url . 'admin/assets/js/um-admin-users.js' ); + wp_register_script('um_admin_users', um_url . 'admin/assets/js/um-admin-users.js', '', '', true ); wp_enqueue_script('um_admin_users'); } @@ -138,10 +138,10 @@ class UM_Admin_Enqueue { ***/ function load_builder(){ - wp_register_script('um_admin_builder', um_url . 'admin/assets/js/um-admin-builder.js' ); + wp_register_script('um_admin_builder', um_url . 'admin/assets/js/um-admin-builder.js', '', '', true ); wp_enqueue_script('um_admin_builder'); - wp_register_script('um_admin_dragdrop', um_url . 'admin/assets/js/um-admin-dragdrop.js' ); + wp_register_script('um_admin_dragdrop', um_url . 'admin/assets/js/um-admin-dragdrop.js', '', '', true ); wp_enqueue_script('um_admin_dragdrop'); wp_register_style('um_admin_builder', um_url . 'admin/assets/css/um-admin-builder.css' ); @@ -193,7 +193,7 @@ class UM_Admin_Enqueue { ***/ function load_custom_scripts(){ - wp_register_script('um_admin_scripts', um_url . 'admin/assets/js/um-admin-scripts.js' ); + wp_register_script('um_admin_scripts', um_url . 'admin/assets/js/um-admin-scripts.js', '', '', true ); wp_enqueue_script('um_admin_scripts'); } @@ -203,7 +203,7 @@ class UM_Admin_Enqueue { ***/ function load_ajax_js(){ - wp_register_script('um_admin_ajax', um_url . 'admin/assets/js/um-admin-ajax.js' ); + wp_register_script('um_admin_ajax', um_url . 'admin/assets/js/um-admin-ajax.js', '', '', true ); wp_enqueue_script('um_admin_ajax'); } @@ -232,6 +232,8 @@ class UM_Admin_Enqueue { if ( strstr( $screen_id, 'ultimatemember') || strstr( $screen_id, 'um_') || strstr($screen_id, 'user') || strstr($screen_id, 'profile') )return true; if ( $screen_id == 'nav-menus' ) return true; + + if ( isset( $post->post_type ) ) return true; return false; @@ -269,14 +271,6 @@ class UM_Admin_Enqueue { $this->load_ajax_js(); $this->load_custom_scripts(); - } else if ( isset( $post->post_type ) ) { - - $ultimatemember->styles->wp_enqueue_scripts(); - - $this->load_global_css(); - $this->load_css(); - $this->load_custom_scripts(); - } } diff --git a/core/um-rewrite.php b/core/um-rewrite.php index 90b39f54..cde9f957 100644 --- a/core/um-rewrite.php +++ b/core/um-rewrite.php @@ -90,7 +90,9 @@ class UM_Rewrite { // Try nice name if ( !$user_id ) { - $the_user = get_user_by( 'slug', um_queried_user() ); + $slug = um_queried_user(); + $slug = str_replace('.','-',$slug); + $the_user = get_user_by( 'slug', $slug ); if ( isset( $the_user->ID ) ){ $user_id = $the_user->ID; } diff --git a/core/um-setup.php b/core/um-setup.php index dc45ae7e..dc74f633 100644 --- a/core/um-setup.php +++ b/core/um-setup.php @@ -345,12 +345,13 @@ class UM_Setup { 'post_title' => $array['title'], 'post_content' => $content, 'post_name' => $slug, - 'post_type' => 'page', + 'post_type' => 'post', 'post_status' => 'publish', 'post_author' => um_user('ID'), ); $post_id = wp_insert_post( $user_page ); + wp_update_post( array('ID' => $post_id, 'post_type' => 'page' ) ); update_post_meta($post_id, '_um_core', $slug); diff --git a/index.php b/index.php index 29d81baa..70b7c092 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ Plugin Name: Ultimate Member Plugin URI: http://ultimatemember.com/ Description: Ultimate Member is a powerful community and membership plugin that allows you to create beautiful community and membership sites with WordPress -Version: 1.0.45 +Version: 1.0.46 Author: Ultimate Member Author URI: http://ultimatemember.com/ */ diff --git a/readme.txt b/readme.txt index 89175982..f086789e 100644 --- a/readme.txt +++ b/readme.txt @@ -7,7 +7,7 @@ Tags: access control, author, authors, author profile, comments, community, comm Requires at least: 4.1 Tested up to: 4.1 -Stable Tag: 1.0.45 +Stable Tag: 1.0.46 License: GNU Version 2 or Any Later Version @@ -124,6 +124,7 @@ Ultimate Member has been translated into the following languages: * English (US) * French +* Spanish * German * Italian * Turkish @@ -185,6 +186,15 @@ The plugin works with popular caching plugins by automatically excluding Ultimat == Changelog == += 1.0.46: February 8, 2015 = + +(Update Recommended) + +* New: added Spanish language pack +* Fixed: important JS conflict in admin when UM is active +* Fixed: profile permalink issue for e-mail usernames +* Fixed: installation issue on some WP databases + = 1.0.45: February 8, 2015 = * Fixed: Multisite bug php Fatal error: call to undefined function wpmu_delete_user() diff --git a/um-init.php b/um-init.php index 4a11b694..0ec516f1 100644 --- a/um-init.php +++ b/um-init.php @@ -16,10 +16,11 @@ class UM_API { $this->available_languages = array( 'en_US' => 'English (US)', + 'es_ES' => 'Español', 'fr_FR' => 'Français', + 'it_IT' => 'Italiano', 'de_DE' => 'Deutsch', 'tr_TR' => 'Türkçe', - 'it_IT' => 'Italiano' ); }