Skip to content

Commit

Permalink
v3.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sybrew committed Sep 15, 2018
1 parent f6ec79d commit 102a270
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
4 changes: 2 additions & 2 deletions autodescription.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: The SEO Framework
* Plugin URI: https://theseoframework.com/
* Description: An automated, advanced, accessible, unbranded and extremely fast SEO solution for any WordPress website.
* Version: 3.1.0
* Version: 3.1.1
* Author: Sybre Waaijer
* Author URI: https://theseoframework.com/
* License: GPLv3
Expand Down Expand Up @@ -53,7 +53,7 @@
*
* @since 2.3.5
*/
define( 'THE_SEO_FRAMEWORK_VERSION', '3.1.0' );
define( 'THE_SEO_FRAMEWORK_VERSION', '3.1.1' );

/**
* The plugin Database version.
Expand Down
9 changes: 6 additions & 3 deletions inc/classes/cache.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -470,13 +470,14 @@ public function get_sitemap_transient_name() {
* Returns ld_json transients for page ID.
*
* @since 3.1.0
* @since 3.1.1 : The first parameter is now optional.
*
* @param int|string|bool $id the Taxonomy or Post ID. If false it will generate for the blog page.
* @param string $taxonomy The taxonomy name.
* @param string|null $type The post type.
* @return string The ld_json cache key.
*/
public function get_ld_json_transient_name( $id, $taxonomy = '', $type = null ) {
public function get_ld_json_transient_name( $id = 0, $taxonomy = '', $type = null ) {

if ( ! $this->get_option( 'cache_meta_schema' ) )
return '';
Expand All @@ -503,6 +504,7 @@ public function get_ld_json_transient_name( $id, $taxonomy = '', $type = null )
* @since 2.6.0 Refactored.
* @since 2.9.1 : 1. Added early singular type detection.
* 2. Moved generation into $this->generate_cache_key_by_query().
* @since 3.1.1 : The first parameter is now optional.
* @see $this->generate_cache_key_by_query() to get cache key from the query.
* @see $this->generate_cache_key_by_type() to get cache key outside of the query.
*
Expand All @@ -511,7 +513,7 @@ public function get_ld_json_transient_name( $id, $taxonomy = '', $type = null )
* @param string $type The Post Type.
* @return string The generated cache key by query or type.
*/
public function generate_cache_key( $id, $taxonomy = '', $type = null ) {
public function generate_cache_key( $id = 0, $taxonomy = '', $type = null ) {

if ( isset( $type ) )
return $this->generate_cache_key_by_type( $id, $taxonomy, $type );
Expand All @@ -525,6 +527,7 @@ public function generate_cache_key( $id, $taxonomy = '', $type = null ) {
* Warning: This can generate errors when used too early if no type has been set.
*
* @since 2.9.1
* @since 3.1.1 : The first parameter is now optional.
* @staticvar array $cached_id : contains cache strings.
* @see $this->generate_cache_key_by_type() to get cache key outside of the query.
*
Expand All @@ -533,7 +536,7 @@ public function generate_cache_key( $id, $taxonomy = '', $type = null ) {
* @param string $type The Post Type
* @return string The generated cache key by query.
*/
public function generate_cache_key_by_query( $page_id, $taxonomy = '', $type = null ) {
public function generate_cache_key_by_query( $page_id = 0, $taxonomy = '', $type = null ) {

$page_id = $page_id ?: $this->get_the_real_ID();

Expand Down
3 changes: 2 additions & 1 deletion inc/classes/core.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -304,12 +304,13 @@ public function is_blog_public() {
*
* @since 2.6.0
* @since 3.1.0 Now uses get_site()
* @since 3.1.1 Now checks for `is_multisite()`, to prevent a crash with Divi's compatibility injection.
*
* @return bool Current blog is spam.
*/
public function current_blog_is_spam_or_deleted() {

if ( ! function_exists( '\\get_site' ) )
if ( ! function_exists( '\\get_site' ) || ! \is_multisite() )
return false;

$site = \get_site();
Expand Down
8 changes: 6 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Tags: SEO, XML Sitemap, Google, Open Graph, Schema.org, Twitter
Requires at least: 4.6.0
Tested up to: 4.9.6
Requires PHP: 5.4.0
Stable tag: 3.1.0
Stable tag: 3.1.1
License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -227,6 +227,10 @@ Please be sure to clear your cache or adjust the plugin's caching settings if de

== Changelog ==

= 3.1.1 =

This tiny update fixes [two issues with v3.1](https://theseoframework.com/?p=2598), our apologies for the inconvenience.

= 3.1.0 - Pure =

*"The difference between something good and something great is attention to detail." - Charles R. Swindoll[†](http://dannybeckettjr.com/2009/10/220079492/)*
Expand Down Expand Up @@ -280,7 +284,7 @@ Fred Brooks' law: "What [one developer](https://theseoframework.com/?p=2562#deta

== Upgrade Notice ==

= 3.1.0 =
= 3.1.1 =
This is a major upgrade. Make a backup of your database before upgrading. WordPress v4.6 (or greater) and PHP v5.4 (or greater) are now required. If you use the Extension Manager, update it to v1.5.2 (or greater) before upgrading this plugin. Downgrading to v3.0.6 possible.

= 3.0.0 =
Expand Down

0 comments on commit 102a270

Please sign in to comment.