Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Open Graph tags on singular post types, and minor search improvements #1604

Merged
merged 8 commits into from
Dec 17, 2018
Merged

Fix Open Graph tags on singular post types, and minor search improvements #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b5f37fb
Display excerpt and other social media on is_singular() posts
benlk Dec 17, 2018
7fc9866
Remove duplicate site title from og:title on non-is_singular non-is_a…
benlk Dec 17, 2018
c1ec6a0
Add is_singular thumbnail to social media for non-is_single pages
benlk Dec 17, 2018
cba6e65
Remove "results for ''" text on Google Custom Search Engine search pa…
benlk Dec 17, 2018
b1fa8c4
Remove search form from global nav when on search page.
benlk Dec 17, 2018
642003d
Remove inconsistent : from GCSE search header on no-result page
benlk Dec 17, 2018
473d535
Changelog for https://github.com/INN/largo/pull/1604
benlk Dec 17, 2018
2c9ae66
Add upgrade notice to 0.6.2 for partials/nav-global.php
benlk Dec 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,24 @@ though this project doesn't succeed in adhering to [Semantic Versioning](https:/

## [Largo 0.6.2](https://github.com/INN/largo/compare/v0.6.1...0.5-dev)

This release contains bug fixes for Largo 0.6.

### Fixes

- Fixes a regression in the behavior of the Largo Follow widget. [Pull request #1600](https://github.com/INN/largo/pull/1600) for [issue #1599](https://github.com/INN/largo/issues/1599).
- Fixes issue where post excerpt and featured media were not being used for open graph tags on post types that are `is_singular()` but not `is_single()`. [Pull request #1604)(https://github.com/INN/largo/pull/1604) for [issue #1602](https://github.com/INN/largo/issues/1602).
- Removes duplicate site title in opengraph tags for non-archive, non-`is_front_page()`, non-`is_singular()` URLs. [Pull request #1604](https://github.com/INN/largo/pull/1604) for [issue #1602](https://github.com/INN/largo/issues/1602).
- Removes search form from global nav bar when on the search page, so that there's only one search form. [Pull request #1604](https://github.com/INN/largo/pull/1604).
- Cleans up the search page when no query has been entered. [Pull request #1604](https://github.com/INN/largo/pull/1604) for [issue #1603](https://github.com/INN/largo/issues/1603).

### Upgrade notices

- If you have a custom `partials/nav-global.php` you may want to copy the `if ( ! is_search() ) { ... }` logic from [pull request #1604](https://github.com/INN/largo/pull/1604/) to reduce user confusion about which search form to use.


## [Largo 0.6.1](https://github.com/INN/largo/compare/v0.6...v0.6.1)

This release contains bugfixes for Largo 0.6.
This release contains bug fixes for Largo 0.6.

### Changes

Expand Down
6 changes: 3 additions & 3 deletions inc/open-graph.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function largo_opengraph() {
global $post;

// set a default thumbnail, if a post has a featured image use that instead
if ( is_single() && has_post_thumbnail( $post->ID ) ) {
if ( is_singular() && has_post_thumbnail( $post->ID ) ) {
$image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'full' );
$thumbnailURL = $image[0];
} else if ( of_get_option( 'logo_thumbnail_sq' ) ) {
Expand All @@ -31,7 +31,7 @@ function largo_opengraph() {
?>

<?php // output appropriate OG tags by page type
if ( is_single() ) {
if ( is_singular() ) {
if ( have_posts() ) {
the_post(); // we need to queue up the post to get the post specific info

Expand All @@ -58,7 +58,7 @@ function largo_opengraph() {
<?php
} else {
?>
<meta property="og:title" content="<?php bloginfo( 'name' ); wp_title(); ?>" />
<meta property="og:title" content="<?php wp_title(); ?>" />
<meta property="og:type" content="article" />
<meta property="og:url" content="<?php echo esc_url( largo_get_current_url() ); ?>"/>
<?php
Expand Down
23 changes: 14 additions & 9 deletions partials/nav-global.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,22 @@
</ul>
<?php }
/* Check to display Donate Button */
if ( of_get_option( 'show_donate_button') )
if ( of_get_option( 'show_donate_button') ) {
largo_donate_button();
?>
<!-- BEGIN Header Search -->
<div id="header-search">
<form class="form-search" role="search" method="get" action="<?php echo esc_url( home_url( '/' ) ); ?>">
<div class="input-append">
<input type="text" placeholder="<?php _e('Search', 'largo'); ?>" class="input-medium appendedInputButton search-query" value="" name="s" /><button type="submit" class="search-submit btn"><?php _e('GO', 'largo'); ?></button>
}

if ( ! is_search() ) {
?>
<div id="header-search">
<form class="form-search" role="search" method="get" action="<?php echo esc_url( home_url( '/' ) ); ?>">
<div class="input-append">
<input type="text" placeholder="<?php _e('Search', 'largo'); ?>" class="input-medium appendedInputButton search-query" value="" name="s" /><button type="submit" class="search-submit btn"><?php _e('GO', 'largo'); ?></button>
</div>
</form>
</div>
</form>
</div>
<?php
}
?>
<!-- END Header Search -->
</div>
</nav>
Expand Down
10 changes: 9 additions & 1 deletion search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@
<?php if (of_get_option('use_gcs') && of_get_option('gcs_id')) { ?>
<h1>
<?php
printf( __('Search results for <span class="search-term">%s</span>', 'largo'), get_search_query() );
$search_query = esc_html( get_search_query() );
if ( empty( $search_query ) ) {
echo wp_kses_post( __('Search', 'largo') );
} else {
echo wp_kses_post( sprintf(
__('Search results for <span class="search-term">%s</span>', 'largo'),
$search_query
) );
}
?>
</h1>

Expand Down