From dad84f025de369c527148927f9d3baa7ad2e81a6 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 11 Apr 2013 00:15:00 +0100
Subject: [PATCH] Issue #1960764 by foopang | xjm: The return value of
 conf_path() should be named ().

---
 core/includes/bootstrap.inc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 6b0762127fe..fc370bf555a 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -382,16 +382,16 @@ function timer_stop($name) {
  * @see default.settings.php
  */
 function conf_path($require_settings = TRUE, $reset = FALSE) {
-  $conf = &drupal_static(__FUNCTION__, '');
+  $conf_path = &drupal_static(__FUNCTION__, '');
 
-  if ($conf && !$reset) {
-    return $conf;
+  if ($conf_path && !$reset) {
+    return $conf_path;
   }
 
   // Check for a simpletest override.
   if ($simpletest_conf_path = _drupal_simpletest_conf_path()) {
-    $conf = $simpletest_conf_path;
-    return $conf;
+    $conf_path = $simpletest_conf_path;
+    return $conf_path;
   }
 
   // Otherwise, use the normal $conf_path.
@@ -400,8 +400,8 @@ function conf_path($require_settings = TRUE, $reset = FALSE) {
     $script_name = $_SERVER['SCRIPT_FILENAME'];
   }
   $http_host = $_SERVER['HTTP_HOST'];
-  $conf = find_conf_path($http_host, $script_name, $require_settings);
-  return $conf;
+  $conf_path = find_conf_path($http_host, $script_name, $require_settings);
+  return $conf_path;
 }
 
 /**