Commit ed7ea849 authored by imac's avatar imac

[Update]Show userLogin if empty name

parent 2549582a
...@@ -431,7 +431,7 @@ function nap_filter_attribute($id, $args, $options, $list_attr, $search) { ...@@ -431,7 +431,7 @@ function nap_filter_attribute($id, $args, $options, $list_attr, $search) {
if( if(
( ($list_couleur && in_array($list_attr['pa_couleur'],$list_couleur)) || empty($list_couleur) ) && ( ($list_couleur && in_array($list_attr['pa_couleur'],$list_couleur)) || empty($list_couleur) ) &&
( ($list_format && in_array($list_attr['pa_format'],$list_format)) || empty($list_format) ) && ( ($list_format && in_array($list_attr['pa_format'],$list_format)) || empty($list_format) ) &&
( ($list_univers && in_array($list_attr['pa_univers'],$list_univers)) || empty($list_univers) ) && ( ($list_univers && in_array($list_attr['pa_univers'],$list_univers)) || empty($list_univers) ) &&
( ($list_matiere && in_array($list_attr['pa_matiere'],$list_matiere)) || empty($list_matiere) ) ( ($list_matiere && in_array($list_attr['pa_matiere'],$list_matiere)) || empty($list_matiere) )
) )
{ {
...@@ -680,7 +680,11 @@ function get_logged_user() { ...@@ -680,7 +680,11 @@ function get_logged_user() {
if (is_user_logged_in()) { if (is_user_logged_in()) {
global $current_user; global $current_user;
get_currentuserinfo(); get_currentuserinfo();
echo $current_user->user_lastname . ' ' . $current_user->user_firstname; if($current_user->user_lastname || $current_user->user_firstname){
echo $current_user->user_lastname . ' ' . $current_user->user_firstname;
}else{
echo $current_user->user_login;
}
echo '<span class = "logout"><a href="' . wp_logout_url( home_url() ) . '">déconnexion</a></span>'; echo '<span class = "logout"><a href="' . wp_logout_url( home_url() ) . '">déconnexion</a></span>';
} else { } else {
echo '<a class="login" href="#">accès pro</a>'; echo '<a class="login" href="#">accès pro</a>';
...@@ -741,18 +745,18 @@ function nap_trash_fiche_technique($post_id) { ...@@ -741,18 +745,18 @@ function nap_trash_fiche_technique($post_id) {
add_action( 'pre_get_posts', 'nap_change_filter_post' ); add_action( 'pre_get_posts', 'nap_change_filter_post' );
function nap_change_filter_post() { function nap_change_filter_post() {
global $wp_query; global $wp_query;
if(is_admin()) { if(is_admin()) {
if(!empty($wp_query->query_vars['product_cat'])) { if(!empty($wp_query->query_vars['product_cat'])) {
setcookie("product_cat", $wp_query->query_vars['product_cat']); setcookie("product_cat", $wp_query->query_vars['product_cat']);
} }
if(!isset($_GET['product_cat']) && ($_GET['post_type'] == 'product')) { if(!isset($_GET['product_cat']) && ($_GET['post_type'] == 'product')) {
$wp_query->query_vars['product_cat'] = $_COOKIE['product_cat']; $wp_query->query_vars['product_cat'] = $_COOKIE['product_cat'];
} }
elseif(isset($_GET['product_cat']) && empty($_GET['product_cat'])) { elseif(isset($_GET['product_cat']) && empty($_GET['product_cat'])) {
setcookie("product_cat", $wp_query->query_vars['product_cat']); setcookie("product_cat", $wp_query->query_vars['product_cat']);
} }
} }
} }
function nap_show_associated_products() { function nap_show_associated_products() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment