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

Version 1.0.50

Browse Source
This commit is contained in:
ultimatemember
2015-02-12 02:16:33 +02:00
parent 23c30f6a39
commit 3af48d0466
10 changed files with 63 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/um-members.css
+2 -1
View File
@@ -178,6 +178,7 @@
background: #fff;
width: 140px;
height: 140px;
float: none !important;
}
.um-member.with-cover .um-member-photo {padding-top: 0}
@@ -187,7 +188,7 @@
position: relative;
top: -35px;
margin-bottom: -45px !important;
float: none;
float: none !important;
opacity: 1;
}
assets/css/um-styles.css
+2
View File
@@ -232,6 +232,8 @@ p.um-notice.err {
margin: 0 0 0 8px;
cursor: pointer;
display: inline-block;
position: relative;
top: 3px;
}
.um-tip i {
assets/css/um.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
core/lib/upload/um-image-upload.php
+2 -1
View File
@@ -17,7 +17,8 @@ if(isset($_FILES[$id]['name'])) {
$temp = $_FILES[$id]["tmp_name"];
$file = $_FILES[$id]["name"];
$file = str_replace(array('(',')','+','&','?','%','{','}','[',']','=',',',';',' '),'',$file);
$file = strtolower($file);
$error = $ultimatemember->files->check_image_upload( $temp, $id );
if ( $error ){
core/um-actions-members.php
+7 -3
View File
@@ -26,14 +26,18 @@
}
$count = count( $search_filters );
?>
<div class="um-search um-search-<?php echo $count; ?>">
<form method="get" action="" />
<?php
<?php if ( isset( $_REQUEST['page_id'] ) && get_option('permalink_structure') == 0 ) { ?>
<input type="hidden" name="page_id" id="page_id" value="<?php echo $_REQUEST['page_id']; ?>" />
<?php }
$i = 0;
foreach( $search_filters as $filter ) {
@@ -54,7 +58,7 @@
<div class="um-clear"></div>
<div class="um-search-submit">
<input type="hidden" name="um_search" id="um_search" value="1" />
<a href="#" class="um-button um-do-search"><?php _e('Search','ultimatemember'); ?></a><a href="<?php echo $ultimatemember->permalinks->get_current_url( true ); ?>" class="um-button um-alt"><?php _e('Reset','ultimatemember'); ?></a>
core/um-enqueue.php
+21 -2
View File
@@ -39,12 +39,24 @@ class UM_Enqueue {
global $ultimatemember;
$exclude = um_get_option('js_css_exclude');
if ( $exclude && is_array( $exclude ) ) {
if ( $exclude && !is_admin() && is_array( $exclude ) ) {
$c_url = $ultimatemember->permalinks->get_current_url( get_option('permalink_structure') );
foreach( $exclude as $match ) {
if ( strstr( $c_url, $match ) )
if ( strstr( $c_url, untrailingslashit( $match ) ) )
return;
}
}
$include = um_get_option('js_css_include');
if ( $include && !is_admin() && is_array( $include ) ) {
$c_url = $ultimatemember->permalinks->get_current_url( get_option('permalink_structure') );
foreach( $include as $match ) {
if ( !strstr( $c_url, untrailingslashit( $match ) ) )
return;
}
@@ -64,6 +76,13 @@ class UM_Enqueue {
}
// load a localized version for date/time
$locale = get_option('WPLANG');
if ( $locale && file_exists( um_path . 'assets/js/pickadate/translations/' . $locale . '.js' ) ) {
wp_register_script('um_datetime_locale', um_url . 'assets/js/pickadate/translations/' . $locale . '.js', '', '', true );
wp_enqueue_script('um_datetime_locale');
}
}
/***
core/um-fields.php
+8 -4
View File
@@ -596,7 +596,8 @@ class UM_Fields {
if ( $array['years_x'] == 'past' ) {
$date = new DateTime( date('Y-n-d') );
$past = $date->modify('-'.$array['years'].' years')->format('Y,n,d');
$past = $date->modify('-'.$array['years'].' years');
$past = $date->format('Y,n,d');
$array['date_min'] = $past;
$array['date_max'] = date('Y,n,d');
@@ -604,7 +605,8 @@ class UM_Fields {
} else if ( $array['years_x'] == 'future' ) {
$date = new DateTime( date('Y-n-d') );
$future = $date->modify('+'.$array['years'].' years')->format('Y,n,d');
$future = $date->modify('+'.$array['years'].' years');
$future = $date->format('Y,n,d');
$array['date_min'] = date('Y,n,d');
$array['date_max'] = $future;
@@ -613,8 +615,10 @@ class UM_Fields {
$date = new DateTime( date('Y-n-d') );
$date_f = new DateTime( date('Y-n-d') );
$past = $date->modify('-'. ( $array['years'] / 2 ).' years')->format('Y,n,d');
$future = $date_f->modify('+'. ( $array['years'] / 2 ).' years')->format('Y,n,d');
$past = $date->modify('-'. ( $array['years'] / 2 ).' years');
$past = $date->format('Y,n,d');
$future = $date_f->modify('+'. ( $array['years'] / 2 ).' years');
$future = $date_f->format('Y,n,d');
$array['date_min'] = $past;
$array['date_max'] = $future;
index.php
+1 -1
View File
@@ -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.49
Version: 1.0.50
Author: Ultimate Member
Author URI: http://ultimatemember.com/
*/
readme.txt
+10 -1
View File
@@ -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.49
Stable Tag: 1.0.50
License: GNU Version 2 or Any Later Version
@@ -186,6 +186,15 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
== Changelog ==
= 1.0.50: February 12, 2015 =
* New: added option to include plugin js/css only on specific pages (user suggestion)
* Tweak: image and file uploads tweaked
* Fixed: date and time picker localization
* Fixed: bug with date and time fields
* Fixed: issue with searching members with default permalinks used
* Fixed: minor css fixes
= 1.0.49: February 10, 2015 =
* New: added option to disable UM menu (fixes conflict with mega-menu on some themes/plugins)
um-config.php
+9
View File
@@ -1702,6 +1702,15 @@ $this->sections[] = array(
'add_text' => __('Add New Page','ultimatemember'),
),
array(
'id' => 'js_css_include',
'type' => 'multi_text',
'default' => array(),
'title' => __( 'Only load plugin JS and CSS on the following pages','ultimatemember' ),
'desc' => __( 'Enter a url or page slug (e.g /about/) to enable loading the plugin\'s css and js on that page.','ultimatemember' ),
'add_text' => __('Add New Page','ultimatemember'),
),
array(
'id' => 'allow_tracking',
'type' => 'switch',