CRM-13313 - Payments - prevent fatal error when line-item has no price set

[civicrm-core.git] / install / index.php

diff --git a/install/index.php b/install/index.php
index c1a0e0692f3de8864f127aad23b9bf5164bf088e..d70c360066be47a7fe3ae8a574d6c6df6304e30e 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -425,8 +425,8 @@ class InstallRequirements {
 
     $configIDSiniDir = NULL;
     global $cmsPath;
+    $siteDir = getSiteDir($cmsPath, $_SERVER['SCRIPT_FILENAME']);
     if ($installType == 'drupal') {
-      $siteDir = getSiteDir($cmsPath, $_SERVER['SCRIPT_FILENAME']);
 
       // make sure that we can write to sites/default and files/
       $writableDirectories = array(
@@ -964,7 +964,7 @@ class InstallRequirements {
       return TRUE;
     }
     else {
-      $testDetails[2] .= " (the following PHP variables are missing: " . implode(", ", $missing) . ")";
+      $testDetails[2] = " (the following PHP variables are missing: " . implode(", ", $missing) . ")";
       $this->error($testDetails);
     }
   }