Merge pull request #5018 from zploskey/download_helper_refactor

Don't duplicate is_file() and filesize() checks in download helper

1 files changed, 5 insertions, 10 deletions

diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index ea3da1bf4..7500bc827 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -84,23 +84,18 @@ if ( ! function_exists('force_download'))
 				{
 					return;
 				}
-
-				if ( ! @is_file($filepath) OR ($filesize = @filesize($filepath)) === FALSE)
-				{
-					return;
-				}
 			}
 			else
 			{
-				if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
-				{
-					return;
-				}
-
 				$filepath = $filename;
 				$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
 				$filename = end($filename);
 			}
+
+			if ( ! @is_file($filepath) OR ($filesize = @filesize($filepath)) === FALSE)
+			{
+				return;
+			}
 		}
 		else
 		{