From e5e31d472cd038e028692e6794e749e0efef917c Mon Sep 17 00:00:00 2001 From: Philip Arthur Moore Date: Tue, 6 Jan 2015 10:45:45 +0700 Subject: [PATCH 1/5] Update WP versions that are being used in Travis checks. [skip ci] --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6933ef0491..fb80881e5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,14 +26,14 @@ env: # @link https://github.com/WordPress/WordPress - WP_VERSION=master WP_MULTISITE=0 - WP_VERSION=master WP_MULTISITE=1 + # WordPress 4.1 + # @link https://github.com/WordPress/WordPress/tree/4.1-branch + - WP_VERSION=4.1 WP_MULTISITE=0 + - WP_VERSION=4.1 WP_MULTISITE=1 # WordPress 4.0 # @link https://github.com/WordPress/WordPress/tree/4.0-branch - WP_VERSION=4.0 WP_MULTISITE=0 - WP_VERSION=4.0 WP_MULTISITE=1 - # WordPress 3.9 - # @link https://github.com/WordPress/WordPress/tree/3.9-branch - - WP_VERSION=3.9 WP_MULTISITE=0 - - WP_VERSION=3.9 WP_MULTISITE=1 # Declare 5.6 beta in test matrix. # @link https://buddypress.trac.wordpress.org/ticket/5620 From 5c6311499bf2b72edf052125aa311e83393ad06a Mon Sep 17 00:00:00 2001 From: Philip Arthur Moore Date: Tue, 6 Jan 2015 11:48:47 +0700 Subject: [PATCH 2/5] Update Travis CI build checks. Props @miya0001. See #663. --- codesniffer.ruleset.xml | 3 +++ inc/template-tags.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/codesniffer.ruleset.xml b/codesniffer.ruleset.xml index 3f7872ae86..d2b1ce7a32 100644 --- a/codesniffer.ruleset.xml +++ b/codesniffer.ruleset.xml @@ -1,6 +1,7 @@ + A custom set of code standard rules to check for Underscores. @@ -8,6 +9,8 @@ + + diff --git a/inc/template-tags.php b/inc/template-tags.php index 5dd3759f1e..ebeaca6bf9 100644 --- a/inc/template-tags.php +++ b/inc/template-tags.php @@ -53,7 +53,7 @@ function _s_post_nav() {
%link
', _x( '← %title', 'Previous post link', '_s' ) ); - next_post_link( '
%link
', _x( '%title →', 'Next post link', '_s' ) ); + next_post_link( '
%link
', _x( '%title →', 'Next post link', '_s' ) ); ?> From 894bd6b5d3957730b22c7055db4228b643ca1afa Mon Sep 17 00:00:00 2001 From: Kazue Igarashi Date: Fri, 19 Dec 2014 10:34:18 +0900 Subject: [PATCH 3/5] Use core navigation template tags. * Remove custom arguments from `the_posts_navigation()` and `the_post_navigation()`. * Adjust fallbacks for `the_posts_navigation()` and `the_post_navigation()`. * update pot file. * merge master for style.css and style.scss. --- archive.php | 2 +- inc/template-tags.php | 26 +++++---- index.php | 2 +- languages/_s.pot | 93 +++++++++++++----------------- sass/modules/_infinite-scroll.scss | 2 +- sass/navigation/_menus.scss | 6 +- search.php | 2 +- single.php | 2 +- style.css | 8 +-- 9 files changed, 68 insertions(+), 75 deletions(-) diff --git a/archive.php b/archive.php index 3d0efcc94d..b0a1971b11 100644 --- a/archive.php +++ b/archive.php @@ -34,7 +34,7 @@ - + diff --git a/inc/template-tags.php b/inc/template-tags.php index ebeaca6bf9..2dd9175b2f 100644 --- a/inc/template-tags.php +++ b/inc/template-tags.php @@ -7,26 +7,28 @@ * @package _s */ -if ( ! function_exists( '_s_paging_nav' ) ) : +if ( ! function_exists( 'the_posts_navigation' ) ) : /** * Display navigation to next/previous set of posts when applicable. + * + * @todo Remove this function when WordPress 4.3 is released. */ -function _s_paging_nav() { +function the_posts_navigation() { // Don't print empty markup if there's only one page. if ( $GLOBALS['wp_query']->max_num_pages < 2 ) { return; } ?> -