Version 1.0.50

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
+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');
}
}
/***