summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcatch2013-03-06 21:56:13 (GMT)
committercatch2013-03-06 21:56:13 (GMT)
commit62e136a3ae661b3df909cf8b9dcb7262df52629c (patch)
tree465eff5a8f9b9523fc6a21237c01bcadfe7da2f0
parente5de05353fab82ef9eb8f490374420f4fbbfe99a (diff)
Issue #1049050 by mfb, TwoD, David_Rothstein, jpsoto: Fixed file_stream_wrapper_uri_normalize(): remove dead code.
-rw-r--r--core/includes/file.inc10
1 files changed, 3 insertions, 7 deletions
diff --git a/core/includes/file.inc b/core/includes/file.inc
index 534d211..5f54190 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -343,10 +343,7 @@ function file_stream_wrapper_uri_normalize($uri) {
$uri = $scheme . '://' . $target;
}
}
- else {
- // The default scheme is file://
- $url = 'file://' . $uri;
- }
+
return $uri;
}
@@ -612,9 +609,8 @@ function file_valid_uri($uri) {
* A string specifying the filepath or URI of the source file.
* @param $destination
* A URI containing the destination that $source should be copied to. The
- * URI may be a bare filepath (without a scheme) and in that case the default
- * scheme (file://) will be used. If this value is omitted, Drupal's default
- * files scheme will be used, usually "public://".
+ * URI may be a bare filepath (without a scheme). If this value is omitted,
+ * Drupal's default files scheme will be used, usually "public://".
* @param $replace
* Replace behavior when the destination file already exists:
* - FILE_EXISTS_REPLACE - Replace the existing file.