Merge pull request #125 from MegaphoneJon/CRM-21812

CRM-21812 - don't specify installation type post install
civicrm · Jul 19, 2018 · fd6ba3e · fd6ba3e
2 parents 0e209a4 + 4629f4a
commit fd6ba3e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/civicrm.php b/civicrm.php
@@ -308,7 +308,9 @@ public function setup_instance() {
     if ( $this->civicrm_in_wordpress() ) {
       // this is required for AJAX calls in WordPress admin
       $_GET['noheader'] = TRUE;
-    } else {
+    }
+
+    if ( !CIVICRM_INSTALLED && !$this->civicrm_in_wordpress() ) {
       $_GET['civicrm_install_type'] = 'wordpress';
     }