Merge fix - CRM-15764

[civicrm-core.git] / CRM / Utils / System / Drupal.php

diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php
index 6cd0e7fd8568116ca930db6c0cec7a4eecb89c1d..06cb699977bde8bd8fa29691f15d3c39b99a9ae1 100644 (file)
--- a/CRM/Utils/System/Drupal.php
+++ b/CRM/Utils/System/Drupal.php
@@ -778,15 +778,15 @@ AND    u.status = 1
     //lets remove sript name to reduce one iteration.
     array_pop($pathVars);
 
-    //CRM-7429 --do check for upper most 'includes' dir,
-    //which would effectually work for multisite installation.
+    // CRM-7429 -- do check for uppermost 'includes' dir, which would
+    // work for multisite installation.
     do {
       $cmsRoot = $firstVar . '/' . implode('/', $pathVars);
       $cmsIncludePath = "$cmsRoot/includes";
-      //stop as we found bootstrap.
-      if (@opendir($cmsIncludePath) &&
-        file_exists("$cmsIncludePath/bootstrap.inc")
-      ) {
+      // Stop if we find bootstrap.
+      //
+      // @TODO What is opendir() here for?
+      if (opendir($cmsIncludePath) && file_exists("$cmsIncludePath/bootstrap.inc")) {
         $valid = TRUE;
         break;
       }