Fix merge conflict; see: wpsharks/comet-cache#650

wpsharks · Feb 25, 2016 · 25f8952 · 25f8952
1 parent f2e17bc
commit 25f8952
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/src/includes/closures/Ac/HtmlCUtils.php b/src/includes/closures/Ac/HtmlCUtils.php
@@ -20,9 +20,6 @@
     if (!COMET_CACHE_HTMLC_ENABLE) {
         return $cache; // Nothing to do here.
     }
-    if ($self->is_user_logged_in && !COMET_CACHE_HTMLC_WHEN_LOGGED_IN) {
-        return $cache; // Nothing to do here.
-    }
     // Deals with multisite base & sub-directory installs.
     // e.g. `htmlc/cache/public/www-example-com` (standard WP installation).
     // e.g. `htmlc/cache/public/[[/base]/child1]/www-example-com` (multisite network).

diff --git a/src/includes/templates/advanced-cache.txt b/src/includes/templates/advanced-cache.txt
@@ -250,18 +250,6 @@ if (!defined('COMET_CACHE_HTMLC_ENABLE')) {
 }
 /*[/pro]*/
 /*[pro strip-from="lite"]*/
-if (!defined('COMET_CACHE_HTMLC_WHEN_LOGGED_IN')) {
-    /**
-     * Enable HTML compressor when logged in?
-     *
-     * @since 140422 First documented version.
-     *
-     * @var string|integer|boolean A boolean-ish value; e.g. `1` or `0`.
-     */
-    define('COMET_CACHE_HTMLC_WHEN_LOGGED_IN', '%%COMET_CACHE_HTMLC_WHEN_LOGGED_IN%%');
-}
-/*[/pro]*/
-/*[pro strip-from="lite"]*/
 if (!defined('COMET_CACHE_HTMLC_CSS_EXCLUSIONS')) {
     /**
      * CSS exclusions for the HTML compressor.