diff --git a/admin/assets/css/um-admin-columns.css b/admin/assets/css/um-admin-columns.css
index 9167e799..8fcacbed 100644
--- a/admin/assets/css/um-admin-columns.css
+++ b/admin/assets/css/um-admin-columns.css
@@ -17,10 +17,6 @@
.um-admin.post-type-um_role .manage-column.column-count {width: 150px}
.um-admin.post-type-um_role .manage-column.column-core {width: 150px}
-.um-admin.users-php .manage-column.column-username {width: 300px}
-.um-admin.users-php .manage-column.column-um_role {width: 140px}
-.um-admin.users-php .manage-column.column-um_status {width: 160px}
-
.um-admin.users-php .tablenav.top .bulkactions,
.um-admin.users-php .tablenav.bottom .bulkactions{display:none}
diff --git a/admin/core/um-admin-users.php b/admin/core/um-admin-users.php
index 7507fc26..6675ef54 100644
--- a/admin/core/um-admin-users.php
+++ b/admin/core/um-admin-users.php
@@ -317,14 +317,7 @@ class UM_Admin_Users {
$admin = new UM_Admin_Metabox();
- unset($columns['posts']);
- unset($columns['email']);
-
$columns['um_role'] = __('Community Role','ultimatemember') . $admin->_tooltip( __('This is the membership role set by Ultimate Member plugin','ultimatemember') );
-
- $columns['role'] = __('WordPress Role','ultimatemember') . $admin->_tooltip( __('This is the membership role set by WordPress','ultimatemember') );
-
- $columns['um_status'] = __('Status','ultimatemember') . $admin->_tooltip( __('This is current user status in your membership site','ultimatemember') );
return $columns;
}
@@ -333,21 +326,8 @@ class UM_Admin_Users {
*** @show user columns
***/
function manage_users_custom_column($value, $column_name, $user_id) {
-
global $ultimatemember;
- if ( 'um_status' == $column_name ) {
-
- um_fetch_user( $user_id );
- if ( um_user('account_status') == 'approved' ) {
- $output = ''.um_user('account_status_name').'';
- } else {
- $output = ''.um_user('account_status_name').'';
- }
- return $output;
-
- }
-
if ( $this->custom_role == $column_name ) {
um_fetch_user( $user_id );
diff --git a/core/um-actions-account.php b/core/um-actions-account.php
index 3f6aad07..4b83517c 100644
--- a/core/um-actions-account.php
+++ b/core/um-actions-account.php
@@ -58,26 +58,26 @@
global $ultimatemember;
if ( strlen(trim( $_POST['first_name'] ) ) == 0 ) {
- $ultimatemember->form->add_error('first_name', 'You must provide your first name');
+ $ultimatemember->form->add_error('first_name', __('You must provide your first name','ultimatemember') );
}
if ( strlen(trim( $_POST['last_name'] ) ) == 0 ) {
- $ultimatemember->form->add_error('last_name', 'You must provide your last name');
+ $ultimatemember->form->add_error('last_name', __('You must provide your last name','ultimatemember') );
}
if ( strlen(trim( $_POST['user_email'] ) ) == 0 ) {
- $ultimatemember->form->add_error('user_email', 'You must provide your e-mail');
+ $ultimatemember->form->add_error('user_email', __('You must provide your e-mail','ultimatemember') );
}
if ( !is_email( $_POST['user_email'] ) ) {
- $ultimatemember->form->add_error('user_email', 'Please provide a valid e-mail');
+ $ultimatemember->form->add_error('user_email', __('Please provide a valid e-mail','ultimatemember') );
}
$ultimatemember->account->current_tab = 'general';
if ( $_POST['current_user_password'] != '' ) {
if ( !wp_check_password( $_POST['current_user_password'], um_user('user_pass'), um_user('ID') ) ) {
- $ultimatemember->form->add_error('current_user_password', 'This is not your password');
+ $ultimatemember->form->add_error('current_user_password', __('This is not your password','ultimatemember') );
$ultimatemember->account->current_tab = 'password';
} else { // correct password
@@ -108,10 +108,10 @@
if ( isset($_POST['um_account_submit']) && $_POST['um_account_submit'] == __('Delete Account','ultimatemember') ) {
if ( strlen(trim( $_POST['single_user_password'] ) ) == 0 ) {
- $ultimatemember->form->add_error('single_user_password', 'You must enter your password');
+ $ultimatemember->form->add_error('single_user_password', __('You must enter your password','ultimatemember') );
} else {
if ( !wp_check_password( $_POST['single_user_password'], um_user('user_pass'), um_user('ID') ) ) {
- $ultimatemember->form->add_error('single_user_password', 'This is not your password');
+ $ultimatemember->form->add_error('single_user_password', __('This is not your password','ultimatemember') );
}
}
$ultimatemember->account->current_tab = 'delete';
diff --git a/core/um-members.php b/core/um-members.php
index 1c112a55..071a34c2 100644
--- a/core/um-members.php
+++ b/core/um-members.php
@@ -148,7 +148,7 @@ class UM_Members {
$array['total_users'] = (isset( $max_users ) && $max_users && $max_users <= $users->total_users ) ? $max_users : $users->total_users;
- $array['page'] = get_query_var('members_page') ? get_query_var('members_page') : 1;
+ $array['page'] = isset($_REQUEST['members_page']) ? $_REQUEST['members_page'] : 1;
$array['total_pages'] = ceil( $array['total_users'] / $profiles_per_page );
diff --git a/core/um-permalinks.php b/core/um-permalinks.php
index 81f166c8..aca24091 100644
--- a/core/um-permalinks.php
+++ b/core/um-permalinks.php
@@ -34,7 +34,7 @@ class UM_Permalinks {
global $post;
if ( is_front_page() ) :
- $page_url = home_url();
+ $page_url = home_url() . $_SERVER["REQUEST_URI"];
else :
$page_url = 'http';
diff --git a/core/um-rewrite.php b/core/um-rewrite.php
index d89a89dc..fbc2d37b 100644
--- a/core/um-rewrite.php
+++ b/core/um-rewrite.php
@@ -22,7 +22,6 @@ class UM_Rewrite {
$public_query_vars[] = 'um_tab';
$public_query_vars[] = 'profiletab';
$public_query_vars[] = 'subnav';
- $public_query_vars[] = 'members_page';
return $public_query_vars;
}
diff --git a/core/um-setup.php b/core/um-setup.php
index e7b66c3c..1e5062d3 100644
--- a/core/um-setup.php
+++ b/core/um-setup.php
@@ -379,13 +379,12 @@ class UM_Setup {
$users = get_users( array('fields' => 'ID') );
foreach( $users as $id ) {
-
- if ( !get_user_meta( $id, 'account_status', true ) ) {
- update_user_meta( $id, 'account_status', 'approved' );
- }
-
+
+ delete_user_meta( $id, 'account_status' );
delete_user_meta( $id, 'role' );
+ update_user_meta( $id, 'account_status', 'approved' );
+
if ( !is_super_admin( $id ) ) {
if ( is_numeric( $id ) ) {
update_user_meta( $id, 'role', 'member' );
diff --git a/index.php b/index.php
index 13d1a8f9..aecee57a 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.58
+Version: 1.0.59
Author: Ultimate Member
Author URI: http://ultimatemember.com/
*/
diff --git a/readme.txt b/readme.txt
index 2074d028..d170b538 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.58
+Stable Tag: 1.0.59
License: GNU Version 2 or Any Later Version
@@ -128,6 +128,7 @@ Ultimate Member has been translated into the following languages:
* Italiano
* Deutsch
* Nederlands
+* Finnish
* Türkçe
== Installation ==
@@ -187,6 +188,12 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
== Changelog ==
+= 1.0.59: February 17, 2015 =
+
+* New added Finnish language (fi_FI)
+* Tweak: show e-mail column in users backend
+* Fixed: issue with showing members directory on frontpage
+
= 1.0.58: February 16, 2015 =
* Fixed: display name as search field in member directory
diff --git a/um-init.php b/um-init.php
index e3cc2a30..4cc8403f 100644
--- a/um-init.php
+++ b/um-init.php
@@ -21,6 +21,7 @@ class UM_API {
'it_IT' => 'Italiano',
'de_DE' => 'Deutsch',
'nl_NL' => 'Nederlands',
+ 'fi_FI' => 'Finnish',
'tr_TR' => 'Türkçe',
);