X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fuser%2Fclass_UserEmailMissingException.php;h=f8549dc3a0ab6c9682a004b4a262a9fecc42fa30;hb=027c5659e968546a21be37e70d700c7e14cba993;hp=803091887c54f50d02a4425c82cb7913e20ad610;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/exceptions/user/class_UserEmailMissingException.php b/framework/main/exceptions/user/class_UserEmailMissingException.php
index 80309188..f8549dc3 100644
--- a/framework/main/exceptions/user/class_UserEmailMissingException.php
+++ b/framework/main/exceptions/user/class_UserEmailMissingException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/exceptions/user/class_UserEmailMissingException.php
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/exceptions/user/class_UserEmailMissingException.php
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -35,16 +31,16 @@ class UserEmailMissingException extends FrameworkException {
 	/**
 	 * The super constructor for all exceptions
 	 *
-	 * @param	$msgArray	The non-optional message for the exception
+	 * @param	$messageArray	The non-optional message for the exception
 	 * @param	$code		An optional code for better debugging
 	 * @return	void
 	 */
-	public function __construct (array $msgArray, $code = 0) {
+	public function __construct (array $messageArray, $code = 0) {
 		// Create the message
 		$message = sprintf('[%s:%d] User email %s was not found.',
-			$msgArray[0]->__toString(),
+			$messageArray[0]->__toString(),
 			$this->getLine(),
-			$msgArray[1]
+			$messageArray[1]
 		);
 
 		// Make sure everything is assigned properly