tmdinosaurcenter
/
tainacan-theme
mirror of https://github.com/tainacan/tainacan-theme.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

This commit is contained in:
Fabiano Alencar 2018-08-13 14:13:03 -03:00
parent f0ee2e1f07
commit cb77b835d4
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/functions/single-functions.php
View File

@ -85,7 +85,6 @@ function social_meta() {
if(is_single() || is_tax() || is_archive()) {
<<<<<<< HEAD
$logo = get_stylesheet_directory_uri().'/assets/images/social-logo.png';
global $wp;
if(is_archive('tainacan-collection')){
@ -105,11 +104,6 @@ function social_meta() {
$excerpt = get_bloginfo('description');
}
}
=======
$logo = get_template_directory_uri().'/assets/images/logo.svg';
$img_info = (has_post_thumbnail($post->ID)) ? wp_get_attachment_image_src(get_post_thumbnail_id($post->ID), "thumbnail") : $logo;
>>>>>>> 3232a6522e85af07571c5b6c99d90963429321ca
$image = array(
'url' => (!empty($img_info[0]) && $img_info[1] >= 200 && $img_info[2] >= 200) ? $img_info[0] : $logo,