#451

Author: btopro

system/boilerplate/site/404.html

@@ -23,7 +23,7 @@
       // https://username.github.io/repo-name/one/two?a=b&c=d#qwe becomes
       // https://username.github.io/repo-name/?p=/one/two&q=a=b~and~c=d#qwe
       // Otherwise, leave segmentCount as 0.
-      var segmentCount = {{ segmentCount }};
+      var segmentCount = {{ ghPagesURLParamCount }};
 
       var l = window.location;
       l.replace(

system/lib/HAXCMSSite.php

@@ -193,7 +193,7 @@ public function rebuildManagedFiles() {
           'description' => $this->manifest->description,
           'forceUpgrade' => $this->getForceUpgrade(),
           'swhash' => array(),
-          'segmentCount' => 2,
+          'ghPagesURLParamCount' => 0,
           'licenseLink' => $licenseLink,
           'licenseName' => $licenseName,
           'serviceWorkerScript' => $this->getServiceWorkerScript($this->basePath . $this->manifest->metadata->site->name . '/'),

system/lib/Operations.php

@@ -1417,7 +1417,7 @@ public function publishSite() {
                     'description' => $site->manifest->description,
                     'forceUpgrade' => $site->getForceUpgrade(),
                     'swhash' => array(),
-                    'segmentCount' => 1,
+                    'ghPagesURLParamCount' => 1,
                     'licenseLink' => $licenseLink,
                     'licenseName' => $licenseName,
                     'serviceWorkerScript' => $site->getServiceWorkerScript('/' . $site->manifest->metadata->site->name . '/', TRUE),
@@ -1456,7 +1456,7 @@ public function publishSite() {
                         $templateVars['basePath'] = $parts['base'];
                     }
                     if ($templateVars['basePath'] == '/') {
-                        $templateVars['segmentCount'] = 0;
+                        $templateVars['ghPagesURLParamCount'] = 0;
                     }
                     // now we need to update the SW to match
                     $templateVars['serviceWorkerScript'] = $site->getServiceWorkerScript($templateVars['basePath'], TRUE);