Bugfix: cpt_next_posts_link correct link for a standard archive

Author: aprokopenko

assets/js/load_more.js

@@ -10,9 +10,9 @@ function initLoadMore() {
     loading = true;
     var $loadmore = jQuery(this),
       link = $loadmore.attr('href'),
-      pagecount = $loadmore.attr('data-pagecount'),
-      selector = $loadmore.attr('data-selector'),
-      container = $loadmore.attr('data-container') || selector;
+      pagecount = $loadmore.data('pagecount'),
+      selector = $loadmore.data('selector'),
+      container = $loadmore.data('container') || selector;
     jQuery.post(
       link,
       {

framework/Objects/Post_Type.php

@@ -112,7 +112,7 @@ abstract class Post_Type {
 	 * IF has_singular == false AND is_searchable == true THEN we need to redirect page from search results to some other page
 	 * custom property: auto-redirect to some URL
 	 *
-	 * @var false|string
+	 * @var boolean|string
 	 */
 	protected $redirect = false;
 
@@ -169,7 +169,7 @@ abstract class Post_Type {
 	 */
 
 	/**
-	 * Taxonomy slugs to add to this CPT, will be used only for standard Category and Tags.
+	 * Taxonomy IDs to add to this CPT, will be used only for standard Category and Tags.
 	 * All other custom taxonomies should register CPT they are used inside the Taxonomy
 	 * affect: taxonomies
 	 *

framework/Objects/Singleton.php

@@ -7,13 +7,6 @@
  * Singleton design pattern base class
  */
 trait Singleton {
-	/**
-	 * Refers to a single instance of this class.
-	 *
-	 * @var self
-	 */
-	protected static $instance = null;
-
 	/**
 	 * Returns the *Singleton* current class.
 	 *

framework/helpers.php

@@ -59,6 +59,11 @@ function cpt_next_posts_link( WP_Query $wp_query, $label, $load_more_attr = '' )
 	$paged    = $wp_query->query_vars['paged'];
 	$max_page = $wp_query->max_num_pages;
 
+	// on default post list we have empty $paged, so need to set into 1.
+	if ( ! $paged ) {
+		$paged = $wp_query->query_vars['paged'] = 1;
+	}
+
 	$nextpage = intval( $paged ) + 1;
 
 	if ( null === $label ) {