Merge branch 'develop'

tlovett1 · Jul 13, 2020 · 80aa30d · 80aa30d
2 parents 01dccaf + 78aa29e
commit 80aa30d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/inc/class-sc-advanced-cache.php b/inc/class-sc-advanced-cache.php
@@ -182,10 +182,11 @@ public function get_file_code() {
 		"\r\n" . "defined( 'ABSPATH' ) || exit;" .
 		"\r\n" . "define( 'SC_ADVANCED_CACHE', true );" .
 		"\r\n" . 'if ( is_admin() ) { return; }' .
-		"\r\n" . "include_once( WP_PLUGIN_DIR . '/simple-cache/inc/pre-wp-functions.php' );" .
+		"\r\n" . "\$plugin_path = defined( 'WP_PLUGIN_DIR' ) ? WP_PLUGIN_DIR : WP_CONTENT_DIR . '/plugins/';" .
+		"\r\n" . "include_once( \$plugin_path . '/simple-cache/inc/pre-wp-functions.php' );" .
 		"\r\n" . "\$GLOBALS['sc_config'] = sc_load_config();" .
 		"\r\n" . "if ( empty( \$GLOBALS['sc_config'] ) || empty( \$GLOBALS['sc_config']['enable_page_caching'] ) ) { return; }" .
-		"\r\n" . "if ( @file_exists( WP_PLUGIN_DIR . '/simple-cache/inc/dropins/" . $cache_file . "' ) ) { include_once( WP_PLUGIN_DIR . '/simple-cache/inc/dropins/" . $cache_file . "' ); }" . "\r\n";
+		"\r\n" . "if ( @file_exists( \$plugin_path . '/simple-cache/inc/dropins/" . $cache_file . "' ) ) { include_once( \$plugin_path . '/simple-cache/inc/dropins/" . $cache_file . "' ); }" . "\r\n";
 		// phpcs:enable
 	}
 

diff --git a/inc/class-sc-object-cache.php b/inc/class-sc-object-cache.php
@@ -85,10 +85,11 @@ public function get_file_code() {
 		"\r\n" . "defined( 'ABSPATH' ) || exit;" .
 		"\r\n" . "define( 'SC_OBJECT_CACHE', true );" .
 		"\r\n" . "defined( 'WP_CACHE_KEY_SALT' ) || define( 'WP_CACHE_KEY_SALT', '{$cache_key_salt}' );" .
-		"\r\n" . "include_once( WP_PLUGIN_DIR . '/simple-cache/inc/pre-wp-functions.php' );" .
+		"\r\n" . "\$plugin_path = defined( 'WP_PLUGIN_DIR' ) ? WP_PLUGIN_DIR : WP_CONTENT_DIR . '/plugins/';" .
+		"\r\n" . "include_once( \$plugin_path . '/simple-cache/inc/pre-wp-functions.php' );" .
 		"\r\n" . "\$GLOBALS['sc_config'] = sc_load_config();" .
 		"\r\n" . "if ( empty( \$GLOBALS['sc_config'] ) || empty( \$GLOBALS['sc_config']['enable_in_memory_object_caching'] ) ) { return; }" .
-		"\r\n" . "if ( @file_exists( WP_PLUGIN_DIR . '/simple-cache/inc/dropins/" . $cache_file . "' ) ) { require_once( WP_PLUGIN_DIR . '/simple-cache/inc/dropins/" . $cache_file . "' ); }" . "\r\n";
+		"\r\n" . "if ( @file_exists( \$plugin_path . '/simple-cache/inc/dropins/" . $cache_file . "' ) ) { require_once( \$plugin_path . '/simple-cache/inc/dropins/" . $cache_file . "' ); }" . "\r\n";
 		// phpcs:enable
 	}
 

diff --git a/readme.txt b/readme.txt
@@ -36,7 +36,10 @@ For full documentation, questions, feature requests, and support concerning the
 
 == Changelog ==
 
-= 1.7.2 =
+= 1.7.4 =
+* Fix WP_PLUGIN_DIR constant
+
+= 1.7.3 =
 * Use WP_PLUGIN_DIR constant
 
 = 1.7.2 =

diff --git a/simple-cache.php b/simple-cache.php
@@ -4,7 +4,7 @@
  * Plugin URI: http://taylorlovett.com
  * Description: A simple caching plugin that just works.
  * Author: Taylor Lovett
- * Version: 1.7.3
+ * Version: 1.7.4
  * Text Domain: simple-cache
  * Domain Path: /languages
  * Author URI: http://taylorlovett.com
@@ -14,7 +14,7 @@
 
 defined( 'ABSPATH' ) || exit;
 
-define( 'SC_VERSION', '1.7.3' );
+define( 'SC_VERSION', '1.7.4' );
 define( 'SC_PATH', dirname( __FILE__ ) );
 
 $active_plugins = get_site_option( 'active_sitewide_plugins' );