Merge 190df9d into 6b7fa8a

codeigniter4 · Nov 18, 2018 · 7049422 · 7049422
2 parents 6b7fa8a + 190df9d
commit 7049422
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
@@ -174,6 +174,10 @@ public function exceptionHandler(\Throwable $exception)
 	 */
 	public function errorHandler(int $severity, string $message, string $file = null, int $line = null, $context = null)
 	{
+		if (! (\error_reporting() & $severity)) {
+			return;
+		}
+
 		// Convert it to an exception and pass it along.
 		throw new \ErrorException($message, 0, $severity, $file, $line);
 	}

diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
@@ -172,7 +172,7 @@ public function move(string $targetPath, string $name = null, bool $overwrite =
 
 		try
 		{
-			@move_uploaded_file($this->path, $destination);
+			move_uploaded_file($this->path, $destination);
 		}
 		catch (\Exception $e)
 		{