Merge branch 'catchpoint:master' into master

thedoc31 · Sep 23, 2024 · 607cc81 · 607cc81
2 parents 52e0d92 + b44f470
commit 607cc81
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/www/archive.inc b/www/archive.inc
@@ -281,6 +281,7 @@ function RestoreArchive($id)
 {
     $isSaaSTest = (stripos($id, '_saas_') !== false);
     $saas_capture_prefix = GetSetting("cp_saas_capture_prefix");
+    $isInstantTest = (stripos($id, '_instant_') !== false);
 
     $ret = false;
     if (TestArchiveExpired($id)) {
@@ -309,7 +310,7 @@ function RestoreArchive($id)
                 }
             }
             //saas tests do not specifiy capture server in the URL, so we'll hardcode it
-            if ($isSaaSTest) {
+            if ($isSaaSTest || $isInstantTest) {
                 $capture_server = GetSetting("cp_capture_$saas_capture_prefix");
                 $capture_salt = GetSetting("cp_capture_salt_$saas_capture_prefix");
             }
@@ -417,6 +418,9 @@ function RestoreArchive($id)
                     if ($deleteZip) {
                         @unlink($zipfile);
                     }
+                    if ($isInstantTest) {
+                        ProcessUploadedTest($id);
+                    }
                 }
             } else {
                 $ret = true;

diff --git a/www/templates/layouts/includes/wpt-header.php b/www/templates/layouts/includes/wpt-header.php
@@ -142,9 +142,7 @@ function addTab($tabName, $tabUrl, $addClass = '')
                                             <li class="wptheader_nav_menu_link"><a href="https://product.webpagetest.org/events/">Events</a></li>
                                             <?php if (Util::getSetting('forums_url')) : ?>
                                                 <li class="wptheader_nav_menu_link"><a href="<?= Util::getSetting('forums_url') ?>">Forums</a></li>
-                                            <?php endif; //(Util::getSetting('forums_url')):
-                                            ?>
-                                            <li class="wptheader_nav_menu_link"><a href="https://store-catchpoint.myshopify.com/collections/webpagetest">Shop Gear</a></li>
+                                            <?php endif; ?>
                                         </ul>
                                         <a href="/learn/lightning-fast-web-performance/" class="banner_lfwp">
                                             <span class="banner_lfwp_line">Lightning-Fast <b>Web Performance</b></span>