Skip to content

Commit

Permalink
Merge branch 'develop' into update/contributors-list
Browse files Browse the repository at this point in the history
  • Loading branch information
valendesigns committed May 21, 2019
2 parents daf6d59 + 062b442 commit 83b0d45
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ to uphold this code. Please report unacceptable behavior to engage@xwp.co.
- If you are not familiar with branching please read [_A successful Git branching model_](http://nvie.com/posts/a-successful-git-branching-model/) before you go any further.
- If adding a new feature:
- Add accompanying test case.
- Provide a convincing reason to add this feature. Ideally you should open a suggestion issue first and have it green-lit before working on it.
- Provide a convincing reason to add this feature. Ideally, you should open a suggestion issue first and have it green-lit before working on it.
- If fixing a bug:
- Provide a detailed description of the bug in the PR. Live demo preferred.
- Add appropriate test coverage if applicable.
Expand Down
8 changes: 4 additions & 4 deletions service/api/wp-content/mu-plugins/advanced-post-cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Advanced_Post_Cache {
/* Per query data */
var $cache_key = ''; // md5 of current SQL query
var $all_post_ids = false; // IDs of all posts current SQL query returns
var $cached_post_ids = array(); // subset of $all_post_ids whose posts are currently in cache
var $cached_post_ids = array(); // Subset of $all_post_ids whose posts are currently in cache
var $cached_posts = array();
var $found_posts = false; // The result of the FOUND_ROWS() query
var $cache_func = 'wp_cache_add'; // Turns to set if there seems to be inconsistencies
Expand Down Expand Up @@ -90,8 +90,8 @@ function flush_cache() {
// We already flushed once this page load, and have not put anything into the cache since.
// OTHER processes may have put something into the cache! In theory, this could cause stale caches.
// We do this since clean_post_cache() (which fires the action this method attaches to) is called RECURSIVELY for all descendants.
// if ( !$this->need_to_flush_cache )
// return;
// if ( !$this->need_to_flush_cache )
// return;

$this->cache_incr = wp_cache_incr( 'advanced_post_cache', 1, 'cache_incrementors' );
if ( 10 < strlen( $this->cache_incr ) ) {
Expand Down Expand Up @@ -243,4 +243,4 @@ function dont_clear_advanced_post_cache() {
// Don't clear Advanced Post Cache for a new comment - temp core hack
// http://core.trac.wordpress.org/ticket/15565
add_action( 'wp_updating_comment_count', 'dont_clear_advanced_post_cache' );
add_action( 'wp_update_comment_count' , 'do_clear_advanced_post_cache' );
add_action( 'wp_update_comment_count' , 'do_clear_advanced_post_cache' );

0 comments on commit 83b0d45

Please sign in to comment.