Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
cheh committed Nov 18, 2015
2 parents 88496dd + 71e34f5 commit 734b732
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
9 changes: 3 additions & 6 deletions lib/functions/template-tags.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ function cherry_paging_nav() {
* Display navigation to next/previous post when applicable.
*
* @since 4.0.0
* @since 4.0.5 Using a native WordPress function `the_post_navigation`.
* @since 4.0.5 Using a native WordPress function `the_post_navigation`.
* @since 4.0.5.1 Stop using a native function `the_post_navigation` - absence a important
* CSS-class `.paging-navigation`
*/
function cherry_post_nav() {
$post_type = get_post_type();
Expand All @@ -166,11 +168,6 @@ function cherry_post_nav() {
return;
}

if ( function_exists( 'the_post_navigation' ) ) {
the_post_navigation();
return;
}

// Don't print empty markup if there's nowhere to navigate.
$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
$next = get_adjacent_post( false, '', false );
Expand Down
2 changes: 1 addition & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Theme URI: http://www.cherryframework.com/
Author: Cherry Team
Author URI: http://www.cherryframework.com/
Description: Cherry Framework parent theme based on _s started theme for WordPress with enhanced functionality and extended possibilities.
Version: 4.0.5
Version: 4.0.5.1
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: fixed-layout, fluid-layout, responsive-layout, left-sidebar, right-sidebar, custom-menu, featured-images, full-width-template, post-formats, sticky-post, theme-options, translation-ready
Expand Down

0 comments on commit 734b732

Please sign in to comment.