Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-21-22-31-28

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

diff --git a/install/index.php b/install/index.php
index 8272ac4bd1c88e3b399d4e146ef68a1ef7f522dc..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);
     }
   }
@@ -1121,8 +1121,8 @@ class Installer extends InstallRequirements {
         // now enable civicrm module.
         module_enable(array('civicrm', 'civicrmtheme'));
 
-        // clear block and page cache, to make sure civicrm link is present in navigation block
-        cache_clear_all();
+        // clear block, page, theme, and hook caches
+        drupal_flush_all_caches();
 
         //add basic drupal permissions
         civicrm_install_set_drupal_perms();
@@ -1183,8 +1183,8 @@ class Installer extends InstallRequirements {
         // now enable civicrm module.
         module_enable(array('civicrm'));
 
-        // clear block and page cache, to make sure civicrm link is present in navigation block
-        cache_clear_all();
+        // clear block, page, theme, and hook caches
+        drupal_flush_all_caches();
 
         //add basic drupal permissions
         db_query('UPDATE {permission} SET perm = CONCAT( perm, \', access CiviMail subscribe/unsubscribe pages, access all custom data, access uploaded files, make online contributions, profile create, profile edit, profile view, register for events, view event info\') WHERE rid IN (1, 2)');