diff --git a/.gitignore b/.gitignore index e43b0f9..242ef13 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS_Store +.svn diff --git a/Extensions/class.eacObjectCache.extension.php b/Extensions/class.eacObjectCache.extension.php index b2b875f..0ba8837 100755 --- a/Extensions/class.eacObjectCache.extension.php +++ b/Extensions/class.eacObjectCache.extension.php @@ -120,7 +120,7 @@ public function admin_options_settings(): void if ($this->checkForInstall('admin') === true && $this->checkForInstall('source') === true) { - $default = $this->varPost('_btnCacheInstall') ?: ((defined('EACDOOJIGGER_OBJECT_CACHE')) ? 'Install' : 'Uninstall'); + $default = $this->varPost('_btnCacheInstall') ?: ((defined('EAC_OBJECT_CACHE')) ? 'Install' : 'Uninstall'); $default = ($default=='Install') ? 'Uninstall' : 'Install'; $this->registerExtensionOptions( [$this->registerAs,$this->registerTab], [ @@ -136,7 +136,7 @@ public function admin_options_settings(): void ); } - if (defined('EACDOOJIGGER_OBJECT_CACHE')) + if (defined('EAC_OBJECT_CACHE')) { global $wp_object_cache; $stats = $wp_object_cache->getStats(); @@ -481,7 +481,7 @@ public function initialize() { if ( ! parent::initialize() ) return; // disabled - if (defined('EACDOOJIGGER_OBJECT_CACHE')) + if (defined('EAC_OBJECT_CACHE')) { global $wp_object_cache; $wp_object_cache->display_stats = $this->get_option('object_cache_stats'); @@ -546,7 +546,7 @@ public function checkForInstall($check='all') // check 3rd-party object cache if ($check == 'all' || $check == 'existing') { - if (file_exists(WP_CONTENT_DIR.'/object-cache.php') && !defined('EACDOOJIGGER_OBJECT_CACHE')) + if (file_exists(WP_CONTENT_DIR.'/object-cache.php') && !defined('EAC_OBJECT_CACHE')) { $plugin_data = get_plugin_data( WP_CONTENT_DIR.'/object-cache.php', true ); if ( ! $plugin_data['Title'] ) $plugin_data['Title'] = '3rd Party Object Cache'; @@ -648,7 +648,7 @@ public function install_object_cache($action) */ public function adminVersionUpdate($curVersion,$newVersion) { - if (defined('EACDOOJIGGER_OBJECT_CACHE')) + if (defined('EAC_OBJECT_CACHE')) { $this->install_object_cache('update'); } diff --git a/readme.md b/readme.md index 606f3d7..48d977e 100644 --- a/readme.md +++ b/readme.md @@ -406,6 +406,7 @@ You should receive a copy of the GNU General Public License along with this prog #### Version 1.0.1 - January 23, 2024 + Improved sanitization and output escaping. ++ Changed constant EACDOOJIGGER_OBJECT_CACHE to EAC_OBJECT_CACHE. #### Version 1.0.0 - December 9, 2023 diff --git a/src/wp-cache.php b/src/wp-cache.php index 2de89be..026e673 100644 --- a/src/wp-cache.php +++ b/src/wp-cache.php @@ -8,7 +8,7 @@ * @subpackage Cache */ -defined( 'EACDOOJIGGER_OBJECT_CACHE' ) || exit; +defined( 'EAC_OBJECT_CACHE' ) || exit; /** * Sets up Object Cache Global and assigns it.