sunnysideup / silverstripe-simple-template-caching

src/Extensions/ControllerExtension.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         }
 
         $sc = SiteConfig::current_site_config();
-        if (! $sc->HasCaching) {
+        if (!$sc->HasCaching) {
             return null;
         }
         /** PageController|ControllerExtension $owner */

src/Extensions/PageControllerExtension.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
             if ($owner->hasMethod('canCachePage')) {
                 // if it can cache the page, then it the cache string will remain empty.
                 $canCache = $owner->canCachePage();
-                self::$_can_cache_content_string .=  $canCache ? '' : $this->getRandomKey();
+                self::$_can_cache_content_string .= $canCache ? '' : $this->getRandomKey();
             }
 
             //action
@@ -75,7 +75,7 @@ 
             $requestVars = $owner->request->requestVars();
             if ($requestVars) {
                 foreach ($owner->request->requestVars() as $key => $item) {
-<<<<<<< HEAD
+<< << <<< HEAD
                     $canCache = false;
 =======
 >>>>>>> 5e6d7b8a22bfca77ec46593a5063fa14ef3c3e64